generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '33d18982fa03feb061c8f744a4f0a9175c1f63ab'

Browse Source 
* 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>
This commit is contained in:
Derek Buitenhuis
2016-04-17 18:47:25 +01:00
parent 6d160afab2 33d18982fa
commit af9cac1be1
26 changed files with 1586 additions and 648 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/mux.c
View File

@@ -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)