[FFmpeg-devel] [PATCH 5/6] Put FF_API_OLD_AVOPTIONS under last use of av_opt_set_defaults2().

[Ronald S. Bultje]

---
 libavcodec/options.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/libavcodec/options.c b/libavcodec/options.c
index 37f3792..ed4d826 100644
--- a/libavcodec/options.c
+++ b/libavcodec/options.c
@@ -91,7 +91,9 @@ static const AVClass av_codec_context_class = {
 
 int avcodec_get_context_defaults3(AVCodecContext *s, const AVCodec *codec)
 {
+#if FF_API_OLD_AVOPTIONS
     int flags=0;
+#endif
     memset(s, 0, sizeof(AVCodecContext));
 
     s->av_class = &av_codec_context_class;
@@ -102,6 +104,7 @@ int avcodec_get_context_defaults3(AVCodecContext *s, const 
AVCodec *codec)
         s->codec_id = codec->id;
     }
 
+#if FF_API_OLD_AVOPTIONS
     if(s->codec_type == AVMEDIA_TYPE_AUDIO)
         flags= AV_OPT_FLAG_AUDIO_PARAM;
     else if(s->codec_type == AVMEDIA_TYPE_VIDEO)
@@ -109,6 +112,9 @@ int avcodec_get_context_defaults3(AVCodecContext *s, const 
AVCodec *codec)
     else if(s->codec_type == AVMEDIA_TYPE_SUBTITLE)
         flags= AV_OPT_FLAG_SUBTITLE_PARAM;
     av_opt_set_defaults2(s, flags, flags);
+#else
+    av_opt_set_defaults(s);
+#endif
 
     s->time_base           = (AVRational){0,1};
     s->framerate           = (AVRational){ 0, 1 };
-- 
2.1.2

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel