apps/ffmpeg-rockchip
1
0
Fork 0
mirror of https://github.com/nyanmisaka/ffmpeg-rockchip.git synced 2026-04-23 16:13:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '7abd35a1ffaecfd79fa07b801621ee11ab595c43'

Browse Source 
* commit '7abd35a1ffaecfd79fa07b801621ee11ab595c43':
  avformat: Add av_cold attributes to init functions missing them

Conflicts:
	libavformat/rtpdec_xiph.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-05-06 10:19:56 +02:00
parent f5846dc98c 7abd35a1ff
commit 5c2ccf83df
10 changed files with 27 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libavformat/rtpdec_mpeg4.c
+3 -1
View File
@@ -29,6 +29,7 @@
#include "rtpdec_formats.h"
#include "internal.h"
#include "libavutil/attributes.h"
#include "libavutil/avstring.h"
#include "libavcodec/get_bits.h"
@@ -252,7 +253,8 @@ static int parse_sdp_line(AVFormatContext *s, int st_index,
return 0;
}
static int init_video(AVFormatContext *s, int st_index, PayloadContext *data)
static av_cold int init_video(AVFormatContext *s, int st_index,
PayloadContext *data)
{
if (st_index < 0)
return 0;