diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-17 18:47:25 +0100 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-17 18:47:40 +0100 |
| commit | af9cac1be1750ecc0e12c6788a3aeed1f1a778be (patch) | |
| tree | 2e34226dbd4010774f6ffef448aab4b7d4f88544 /libavformat/mux.c | |
| parent | 6d160afab2fa8d3bfb216fee96d3537ffc9e86e8 (diff) | |
| parent | 33d18982fa03feb061c8f744a4f0a9175c1f63ab (diff) | |
| download | ffmpeg-af9cac1be1750ecc0e12c6788a3aeed1f1a778be.tar.gz | |
Merge commit '33d18982fa03feb061c8f744a4f0a9175c1f63ab'
* commit '33d18982fa03feb061c8f744a4f0a9175c1f63ab':
lavc: add a new bitstream filtering API
Conversions-by: Hendrik Leppkes <h.leppkes@gmail.com>
Conversions-by: Derek Buitenguis <derek.buitenhuis@gmail.com>
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavformat/mux.c')
| -rw-r--r-- | libavformat/mux.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavformat/mux.c b/libavformat/mux.c index 33301f1d79..6239fd192d 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -309,6 +309,12 @@ FF_DISABLE_DEPRECATION_WARNINGS FF_ENABLE_DEPRECATION_WARNINGS #endif + /* update internal context from codecpar, old bsf api needs this + * FIXME: remove when autobsf uses new bsf API */ + ret = avcodec_parameters_to_context(st->internal->avctx, st->codecpar); + if (ret < 0) + goto fail; + if (!st->time_base.num) { /* fall back on the default timebase values */ if (par->codec_type == AVMEDIA_TYPE_AUDIO && par->sample_rate) |