[SCM] libav/experimental: properly check for FF_API_URL_CLASS instead of LIBAVFORMAT_VERSION_MAJOR
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 17:17:42 UTC 2013
The following commit has been merged in the experimental branch:
commit ade800c5b7ffb58d5f957b9344f24bdad98a4268
Author: Aurelien Jacobs <aurel at gnuage.org>
Date: Fri Oct 15 13:09:35 2010 +0000
properly check for FF_API_URL_CLASS instead of LIBAVFORMAT_VERSION_MAJOR
Originally committed as revision 25484 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c
index aca1fd3..abe8675 100644
--- a/libavformat/rtmpproto.c
+++ b/libavformat/rtmpproto.c
@@ -38,10 +38,10 @@
#include "rtmppkt.h"
/* we can't use av_log() with URLContext yet... */
-#if LIBAVFORMAT_VERSION_MAJOR < 53
-#define LOG_CONTEXT NULL
-#else
+#if FF_API_URL_CLASS
#define LOG_CONTEXT s
+#else
+#define LOG_CONTEXT NULL
#endif
//#define DEBUG
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list