1 --- src/mgui/ffviewer.cpp.ORIG 2013-08-01 11:05:12.962407787 +0200
2 +++ src/mgui/ffviewer.cpp 2013-08-01 11:08:26.907409685 +0200
5 typedef struct AVCodecTag {
6 #if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52,39,00)
15 #if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52,34,00)
16 -static uint FFCodecID2Tag(CodecID codec_id)
17 +static uint FFCodecID2Tag(AVCodecID codec_id)
19 unsigned int ff_codec_get_tag(const AVCodecTag *tags, int id);
20 extern const AVCodecTag ff_codec_bmp_tags[];
21 return ff_codec_get_tag(ff_codec_bmp_tags, codec_id);
24 -static uint FFCodecID2Tag(CodecID codec_id)
25 +static uint FFCodecID2Tag(AVCodecID codec_id)
27 unsigned int codec_get_tag(const AVCodecTag *tags, int id);
28 extern const AVCodecTag codec_bmp_tags[];
30 return (tag>>bit_begin) & 0xFF;
33 -static std::string CodecID2Str(CodecID codec_id)
34 +static std::string CodecID2Str(AVCodecID codec_id)
37 std::string tag_str = boost::format("%1%") % codec_id % bf::stop;
42 -static std::string CodecID2Str(CodecID codec_id)
43 +static std::string CodecID2Str(AVCodecID codec_id)
45 return Int2Str(codec_id);