diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-02 10:47:02 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-02 10:47:02 -0300 |
commit | 40e1222c1402c0d2aded73b95802f8197d0691a6 (patch) | |
tree | e1bf1a01ae7443e4a9f460200dad9580565b27c7 /staging/moc/moc-ffmpeg.patch | |
parent | 3e3dd870121c91097220248a601578b92d332f2b (diff) | |
parent | 37a1064b8105764414f279ced442e6ba2f63bea1 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/camlp5/PKGBUILD
community/dzen2/PKGBUILD
extra/boost/PKGBUILD
extra/libxmi/PKGBUILD
extra/mesa/PKGBUILD
multilib/lib32-mesa/PKGBUILD
Diffstat (limited to 'staging/moc/moc-ffmpeg.patch')
-rw-r--r-- | staging/moc/moc-ffmpeg.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/staging/moc/moc-ffmpeg.patch b/staging/moc/moc-ffmpeg.patch new file mode 100644 index 000000000..7554ea14e --- /dev/null +++ b/staging/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; + } |