[SCM] libav/experimental: add FF_API_PARAMETERS_CODEC_ID define to disable the deprecated codec_id fields in AVFormatParameters
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 17:17:43 UTC 2013
The following commit has been merged in the experimental branch:
commit 0139fdea086cc13b83889ea60ff1e8bcf31f0cce
Author: Aurelien Jacobs <aurel at gnuage.org>
Date: Fri Oct 15 14:19:01 2010 +0000
add FF_API_PARAMETERS_CODEC_ID define to disable the deprecated codec_id
fields in AVFormatParameters
Originally committed as revision 25488 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 4e3812b..41063d6 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -75,6 +75,9 @@
#ifndef FF_API_LAVF_UNUSED
#define FF_API_LAVF_UNUSED (LIBAVFORMAT_VERSION_MAJOR < 53)
#endif
+#ifndef FF_API_PARAMETERS_CODEC_ID
+#define FF_API_PARAMETERS_CODEC_ID (LIBAVFORMAT_VERSION_MAJOR < 53)
+#endif
/**
* I return the LIBAVFORMAT_VERSION_INT constant. You got
@@ -282,7 +285,7 @@ typedef struct AVFormatParameters {
unsigned int initial_pause:1; /**< Do not begin to play the stream
immediately (RTSP only). */
unsigned int prealloced_context:1;
-#if LIBAVFORMAT_VERSION_INT < (53<<16)
+#if FF_API_PARAMETERS_CODEC_ID
attribute_deprecated enum CodecID video_codec_id;
attribute_deprecated enum CodecID audio_codec_id;
#endif
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list