avcodec/options: Set AVCodecContext->codec upon initialization.

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

avcodec/options: Set AVCodecContext->codec upon initialization.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
d1d39042 · Vadim Kalinsky · Michael Niedermayer · bccae390 · d1d39042
Commit d1d39042 authored Nov 12, 2014 by Vadim Kalinsky Committed by Michael Niedermayer Nov 18, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

options.c libavcodec/options.c +3 -1

No files found.
--- a/libavcodec/options.c
+++ b/libavcodec/options.c
@@ -95,8 +95,10 @@ int avcodec_get_context_defaults3(AVCodecContext *s, const AVCodec *codec)
    s->av_class = &av_codec_context_class;

    s->codec_type = codec ? codec->type : AVMEDIA_TYPE_UNKNOWN;
-    if (codec)
+    if (codec) {
+        s->codec = codec;
        s->codec_id = codec->id;
+    }

    if(s->codec_type == AVMEDIA_TYPE_AUDIO)
        flags= AV_OPT_FLAG_AUDIO_PARAM;