Merge commit '7abd35a1ffaecfd79fa07b801621ee11ab595c43'

* 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
10 changed files with 27 additions and 12 deletions

View File

@@ -27,6 +27,7 @@
* @author Josh Allmann <joshua.allmann@gmail.com>
*/
#include "libavutil/attributes.h"
#include "libavutil/avassert.h"
#include "libavutil/avstring.h"
#include "libavutil/base64.h"
@@ -69,8 +70,8 @@ static void xiph_free_context(PayloadContext * data)
av_free(data);
}
static int xiph_vorbis_init(AVFormatContext *ctx, int st_index,
PayloadContext *data)
static av_cold int xiph_vorbis_init(AVFormatContext *ctx, int st_index,
PayloadContext *data)
{
if (st_index < 0)
return 0;