diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-02 15:06:43 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-02 15:07:51 +0200 |
commit | d59ec0adbbc49507202cfedd034870a06cb5ec2a (patch) | |
tree | 7b545b85e7ea9e21401b5114dc2ae264fc403353 /libavformat | |
parent | c5ddd753549c8fb1754503ff6690a0e77e3005e5 (diff) | |
download | ffmpeg-d59ec0adbbc49507202cfedd034870a06cb5ec2a.tar.gz |
avformat_find_stream_info: move ret init down from flush codecs.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
-rw-r--r-- | libavformat/utils.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index 9577968d4f..f7822eeec7 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -2888,8 +2888,6 @@ int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options) int err = 0; av_init_packet(&empty_pkt); - if (ret >= 0 && ic->nb_streams) - ret = -1; /* we could not have all the codec parameters before EOF */ for(i=0;i<ic->nb_streams;i++) { st = ic->streams[i]; @@ -3016,6 +3014,8 @@ int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options) if(ic->probesize) estimate_timings(ic, old_offset); + if (ret >= 0 && ic->nb_streams) + ret = -1; /* we could not have all the codec parameters before EOF */ for(i=0;i<ic->nb_streams;i++) { const char *errmsg; st = ic->streams[i]; |