diff options
author | root <root@rshg054.dnsready.net> | 2011-11-06 23:15:07 +0000 |
---|---|---|
committer | root <root@rshg054.dnsready.net> | 2011-11-06 23:15:07 +0000 |
commit | a4d309341dbcd3c28ee68e818c1d5ef54114adf8 (patch) | |
tree | d8b088a03f5cb2b56b2b7508933b4efcfd67f0b2 /testing/moc/moc-ffmpeg.patch | |
parent | 82fd7f658509afe9737e14e8d1ee9fefe13c9d1f (diff) |
Sun Nov 6 23:15:07 UTC 2011
Diffstat (limited to 'testing/moc/moc-ffmpeg.patch')
-rw-r--r-- | testing/moc/moc-ffmpeg.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/testing/moc/moc-ffmpeg.patch b/testing/moc/moc-ffmpeg.patch new file mode 100644 index 000000000..7554ea14e --- /dev/null +++ b/testing/moc/moc-ffmpeg.patch @@ -0,0 +1,26 @@ +Index: decoder_plugins/ffmpeg/ffmpeg.c +=================================================================== +--- decoder_plugins/ffmpeg/ffmpeg.c (revision 2307) ++++ decoder_plugins/ffmpeg/ffmpeg.c (working copy) +@@ -28,12 +28,6 @@ + #include <ffmpeg/avformat.h> + #endif + +-/* libavformat's API will be changing at version 53, but at present there +- * appears to be no guidance on what will replace the deprecated fields. */ +-#ifndef FF_API_OLD_METADATA +-#define FF_API_OLD_METADATA (LIBAVFORMAT_VERSION_MAJOR < 53) +-#endif +- + /* FFmpeg also likes common names, without that, our common.h and log.h + * would not be included. */ + #undef COMMON_H +@@ -137,7 +131,7 @@ + av_read_play (data->ic); + for (i = 0; i < data->ic->nb_streams; i++) { + data->enc = data->ic->streams[i]->codec; +- if (data->enc->codec_type == CODEC_TYPE_AUDIO) { ++ if (data->enc->codec_type == AVMEDIA_TYPE_AUDIO) { + audio_index = i; + break; + } |