diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-01-29 21:01:44 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-01-29 21:01:44 -0300 |
commit | 6d4537b67f90b1decadcf8434e1a5bdcb6694f7f (patch) | |
tree | 0dfcf0ebb742c6e359f0502d9207b3a600aa3462 /testing/moc/moc-ffmpeg.patch | |
parent | 7a501772e3cb37f438506df7c22a34ed9bba9d88 (diff) | |
parent | db0dace84403023c8d89b8801f12a5ab278dc440 (diff) |
Merge branch 'master' of ssh://gparabola/abslibre-mips64el
Conflicts:
core/glibc/PKGBUILD
Diffstat (limited to 'testing/moc/moc-ffmpeg.patch')
-rw-r--r-- | testing/moc/moc-ffmpeg.patch | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/testing/moc/moc-ffmpeg.patch b/testing/moc/moc-ffmpeg.patch deleted file mode 100644 index 7554ea14e..000000000 --- a/testing/moc/moc-ffmpeg.patch +++ /dev/null @@ -1,26 +0,0 @@ -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; - } |