[FFmpeg-cvslog] avutil: delay removial of FF_API_GET_CHANNEL_LAYOUT_COMPAT

Michael Niedermayer git at videolan.org
Sun Aug 10 00:49:11 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Aug  9 23:19:54 2014 +0200| [5e1832c29c2da50db7c82ec6cbf0bc98892230b7] | committer: Michael Niedermayer

avutil: delay removial of FF_API_GET_CHANNEL_LAYOUT_COMPAT

avoids fate failure of join filter

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5e1832c29c2da50db7c82ec6cbf0bc98892230b7
---

 libavutil/version.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavutil/version.h b/libavutil/version.h
index c30b11d..61e4d5c 100644
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -123,7 +123,7 @@
 #define FF_API_VDPAU                    (LIBAVUTIL_VERSION_MAJOR < 55)
 #endif
 #ifndef FF_API_GET_CHANNEL_LAYOUT_COMPAT
-#define FF_API_GET_CHANNEL_LAYOUT_COMPAT (LIBAVUTIL_VERSION_MAJOR < 54)
+#define FF_API_GET_CHANNEL_LAYOUT_COMPAT (LIBAVUTIL_VERSION_MAJOR < 55)
 #endif
 #ifndef FF_API_OLD_OPENCL
 #define FF_API_OLD_OPENCL               (LIBAVUTIL_VERSION_MAJOR < 54)



More information about the ffmpeg-cvslog mailing list