diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-12-01 17:18:15 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-12-02 19:37:00 +0100 |
| commit | 4059cd395205dbd2ba66963f9d1567b8847e80b8 (patch) | |
| tree | 800290896684ca87c9e5795880b9c771d1ef8e3d | |
| parent | 78519a0029734d1d11e735d568fc402709bb6427 (diff) | |
| download | ffmpeg-streaming-4059cd395205dbd2ba66963f9d1567b8847e80b8.zip ffmpeg-streaming-4059cd395205dbd2ba66963f9d1567b8847e80b8.tar.gz | |
avformat/ffmenc: Remove the last use of st->codec
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavformat/ffmenc.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/libavformat/ffmenc.c b/libavformat/ffmenc.c index caf278f..ef7dc3a 100644 --- a/libavformat/ffmenc.c +++ b/libavformat/ffmenc.c @@ -148,11 +148,11 @@ static int ffm_write_header_codec_ctx(AVIOContext *pb, AVCodecParameters *ctxpar #undef ENC } -static int ffm_write_recommended_config(AVIOContext *pb, AVCodecContext *ctx, unsigned tag, +static int ffm_write_recommended_config(AVIOContext *pb, AVCodecParameters *codecpar, unsigned tag, const char *configuration) { int ret; - const AVCodec *enc = ctx->codec ? ctx->codec : avcodec_find_encoder(ctx->codec_id); + const AVCodec *enc = avcodec_find_encoder(codecpar->codec_id); AVIOContext *tmp; AVDictionaryEntry *t = NULL; AVDictionary *all = NULL, *comm = NULL, *prv = NULL; @@ -207,7 +207,6 @@ static int ffm_write_header(AVFormatContext *s) FFMContext *ffm = s->priv_data; AVStream *st; AVIOContext *pb = s->pb; - AVCodecContext *codec; AVCodecParameters *codecpar; int bit_rate, i, ret; @@ -242,7 +241,6 @@ static int ffm_write_header(AVFormatContext *s) if(avio_open_dyn_buf(&pb) < 0) return AVERROR(ENOMEM); - codec = st->codec; codecpar = st->codecpar; /* generic info */ avio_wb32(pb, codecpar->codec_id); @@ -271,7 +269,7 @@ static int ffm_write_header(AVFormatContext *s) if (st->recommended_encoder_configuration) { av_log(NULL, AV_LOG_DEBUG, "writing recommended configuration: %s\n", st->recommended_encoder_configuration); - if ((ret = ffm_write_recommended_config(s->pb, codec, MKBETAG('S', '2', 'V', 'I'), + if ((ret = ffm_write_recommended_config(s->pb, codecpar, MKBETAG('S', '2', 'V', 'I'), st->recommended_encoder_configuration)) < 0) return ret; } else if ((ret = ffm_write_header_codec_ctx(s->pb, codecpar, MKBETAG('S', '2', 'V', 'I'), AV_OPT_FLAG_VIDEO_PARAM)) < 0) @@ -281,7 +279,7 @@ static int ffm_write_header(AVFormatContext *s) if (st->recommended_encoder_configuration) { av_log(NULL, AV_LOG_DEBUG, "writing recommended configuration: %s\n", st->recommended_encoder_configuration); - if ((ret = ffm_write_recommended_config(s->pb, codec, MKBETAG('S', '2', 'A', 'U'), + if ((ret = ffm_write_recommended_config(s->pb, codecpar, MKBETAG('S', '2', 'A', 'U'), st->recommended_encoder_configuration)) < 0) return ret; } else if ((ret = ffm_write_header_codec_ctx(s->pb, codecpar, MKBETAG('S', '2', 'A', 'U'), AV_OPT_FLAG_AUDIO_PARAM)) < 0) |
