aboutsummaryrefslogtreecommitdiffstats
path: root/libavutil/cast5.h
diff options
context:
space:
mode:
authorAnssi Hannula <anssi.hannula@iki.fi>2016-07-26 13:23:43 +0300
committerAnssi Hannula <anssi.hannula@iki.fi>2016-07-28 01:24:57 +0300
commit60873bf992eab1d3bad8dd0fd11336363d44854d (patch)
tree1f417bace304a78d349c09943a314fd2a0ac7e83 /libavutil/cast5.h
parentc26305f6aec005db39e04e628f6294635ddebaad (diff)
downloadffmpeg-60873bf992eab1d3bad8dd0fd11336363d44854d.tar.gz
avformat/utils: Fix find_stream_info not considering the extradata it found
Commit 9200514ad8717c6 ("lavf: replace AVStream.codec with AVStream.codecpar") merged in commit 6f69f7a8bf6a0d01 changed avformat_find_stream_info() to put the extradata it got from st->parser->parser->split() to st->internal->avctx instead of st->codec (extradata in st->internal->avctx will be later copied to st->codecpar). However, in the same function, the "is stream ready?" check was changed to check for extradata in st->codecpar instead of st->codec, even though st->codecpar is not yet updated at that point. Extradata retrieved from split() is therefore not considered anymore, and avformat_find_stream_info() will therefore needlessly continue probing in some cases. Fix that by checking for the extradata at st->internal->avctx where it is actually put.
Diffstat (limited to 'libavutil/cast5.h')
0 files changed, 0 insertions, 0 deletions