virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-11-23 21:54:53 +02:00
Code Issues Releases 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

4
libavformat/rtpdec_mpegts.c
View File

@@ -19,6 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "libavutil/attributes.h"
#include "mpegts.h"
#include "rtpdec_formats.h"
@@ -43,7 +44,8 @@ static void mpegts_free_context(PayloadContext *data)
av_free(data);
}
static int mpegts_init(AVFormatContext *ctx, int st_index, PayloadContext *data)
static av_cold int mpegts_init(AVFormatContext *ctx, int st_index,
PayloadContext *data)
{
data->ts = ff_mpegts_parse_open(ctx);
if (!data->ts)