diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-06-09 11:22:01 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-06-09 19:32:56 +0200 |
| commit | 6826f16e4a3629c801396dca3ada8a78fc506e85 (patch) | |
| tree | 0ef6d5d844dd38af9593f14122226d1546957fbd /libavformat/utils.c | |
| parent | 218bb8b3f370c00b2dba2e6bb1ce4628e6870ad5 (diff) | |
| download | ffmpeg-6826f16e4a3629c801396dca3ada8a78fc506e85.tar.gz | |
avformat/utils: Do not overwrite, but use sample_fmt from context
Fixes Ticket 3759
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavformat/utils.c')
| -rw-r--r-- | libavformat/utils.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index ff52b5294c..cb8d91008d 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -3753,6 +3753,9 @@ FF_ENABLE_DEPRECATION_WARNINGS /* if no packet was ever seen, update context now for has_codec_parameters */ if (!st->internal->avctx_inited) { + if (st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO && + st->codecpar->format == AV_SAMPLE_FMT_NONE) + st->codecpar->format = st->internal->avctx->sample_fmt; ret = avcodec_parameters_to_context(st->internal->avctx, st->codecpar); if (ret < 0) goto find_stream_info_err; |