[SCM] libav/experimental: do not fail av_find_stream_info() if params for all streams could not be found
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 15:48:23 UTC 2013
The following commit has been merged in the experimental branch:
commit 344a18c3b8b783756b209e515e004bb21b03c7a4
Author: Måns Rullgård <mans at mansr.com>
Date: Thu Jun 29 19:02:15 2006 +0000
do not fail av_find_stream_info() if params for all streams could not be found
Originally committed as revision 5545 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 51489a3..74ec667 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -1939,11 +1939,10 @@ int av_find_stream_info(AVFormatContext *ic)
char buf[256];
avcodec_string(buf, sizeof(buf), st->codec, 0);
av_log(ic, AV_LOG_INFO, "Could not find codec parameters (%s)\n", buf);
- break;
+ } else {
+ ret = 0;
}
}
- if (i == ic->nb_streams)
- ret = 0;
break;
}
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list