diff options
Diffstat (limited to 'multimedia/bombono-dvd/patches/fix_ffmpeg_codecid.patch')
| -rw-r--r-- | multimedia/bombono-dvd/patches/fix_ffmpeg_codecid.patch | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/multimedia/bombono-dvd/patches/fix_ffmpeg_codecid.patch b/multimedia/bombono-dvd/patches/fix_ffmpeg_codecid.patch new file mode 100644 index 0000000000..08abbd0beb --- /dev/null +++ b/multimedia/bombono-dvd/patches/fix_ffmpeg_codecid.patch @@ -0,0 +1,47 @@ +diff -u -r -N old/src/mgui/ffviewer.cpp new/src/mgui/ffviewer.cpp +--- old/src/mgui/ffviewer.cpp 2013-03-07 22:20:45.000000000 +0100 ++++ new/src/mgui/ffviewer.cpp 2013-08-14 08:56:12.917285000 +0200 +@@ -62,7 +62,7 @@ + + typedef struct AVCodecTag { + #if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52,39,00) +- enum CodecID id; ++ enum AVCodecID id; + #else + int id; + #endif +@@ -70,14 +70,14 @@ + } AVCodecTag; + + #if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52,34,00) +-static uint FFCodecID2Tag(CodecID codec_id) ++static uint FFCodecID2Tag(AVCodecID codec_id) + { + unsigned int ff_codec_get_tag(const AVCodecTag *tags, int id); + extern const AVCodecTag ff_codec_bmp_tags[]; + return ff_codec_get_tag(ff_codec_bmp_tags, codec_id); + } + #else +-static uint FFCodecID2Tag(CodecID codec_id) ++static uint FFCodecID2Tag(AVCodecID codec_id) + { + unsigned int codec_get_tag(const AVCodecTag *tags, int id); + extern const AVCodecTag codec_bmp_tags[]; +@@ -388,7 +388,7 @@ + return (tag>>bit_begin) & 0xFF; + } + +-static std::string CodecID2Str(CodecID codec_id) ++static std::string CodecID2Str(AVCodecID codec_id) + { + #ifdef _MSC_VER + std::string tag_str = boost::format("%1%") % codec_id % bf::stop; +@@ -406,7 +406,7 @@ + + #else // CALC_FF_TAG + +-static std::string CodecID2Str(CodecID codec_id) ++static std::string CodecID2Str(AVCodecID codec_id) + { + return Int2Str(codec_id); + } |