summaryrefslogtreecommitdiff
path: root/libavformat/utils.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2016-06-09 19:11:18 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2016-06-09 19:32:56 +0200
commit218bb8b3f370c00b2dba2e6bb1ce4628e6870ad5 (patch)
tree2c9741c9960c0cfd95a9c0c0403a76182251fbac /libavformat/utils.c
parent2a70e78a2885aa9264f95b293a2169e57ca1bbdb (diff)
avformat/utils: Open decoder even if there are no packets if parameters are missing
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavformat/utils.c')
-rw-r--r--libavformat/utils.c13
1 files changed, 11 insertions, 2 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c
index db699de314..ff52b5294c 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -3602,14 +3602,23 @@ FF_ENABLE_DEPRECATION_WARNINGS
count++;
}
- if (eof_reached && ic->internal->packet_buffer) {
+ if (eof_reached) {
int stream_index;
for (stream_index = 0; stream_index < ic->nb_streams; stream_index++) {
st = ic->streams[stream_index];
+ avctx = st->internal->avctx;
+ if (!has_codec_parameters(st, NULL)) {
+ AVCodec *codec = find_decoder(ic, st, st->codecpar->codec_id);
+ if (codec && !avctx->codec) {
+ if (avcodec_open2(avctx, codec, (options && stream_index < orig_nb_streams) ? &options[stream_index] : NULL) < 0)
+ av_log(ic, AV_LOG_WARNING,
+ "Failed to open codec in av_find_stream_info\n");
+ }
+ }
// EOF already reached while reading the stream above.
// So continue with reoordering DTS with whatever delay we have.
- if (!has_decode_delay_been_guessed(st)) {
+ if (ic->internal->packet_buffer && !has_decode_delay_been_guessed(st)) {
update_dts_from_pts(ic, stream_index, ic->internal->packet_buffer);
}
}