Commit e19456e3 authored by Michael Niedermayer's avatar Michael Niedermayer

fixing demuxing for short files where the framerate detection failed

Originally committed as revision 3859 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent b4aea108
...@@ -1783,6 +1783,11 @@ int av_find_stream_info(AVFormatContext *ic) ...@@ -1783,6 +1783,11 @@ int av_find_stream_info(AVFormatContext *ic)
if (ret < 0) { if (ret < 0) {
/* EOF or error */ /* EOF or error */
ret = -1; /* we could not have all the codec parameters before EOF */ ret = -1; /* we could not have all the codec parameters before EOF */
for(i=0;i<ic->nb_streams;i++) {
st = ic->streams[i];
if (!has_codec_parameters(&st->codec))
break;
}
if ((ic->ctx_flags & AVFMTCTX_NOHEADER) && if ((ic->ctx_flags & AVFMTCTX_NOHEADER) &&
i == ic->nb_streams) i == ic->nb_streams)
ret = 0; ret = 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment