[FFmpeg-cvslog] riff: ignore ff_read_riff_info() failure.

Michael Niedermayer git at videolan.org
Mon Dec 10 00:55:16 CET 2012


ffmpeg | branch: release/1.0 | Michael Niedermayer <michaelni at gmx.at> | Fri Nov 23 23:35:16 2012 +0100| [c389ae543a5cf9176ce935ef685f128227525c5e] | committer: Carl Eugen Hoyos

riff: ignore ff_read_riff_info() failure.

Some files simply contain invalid info tags.
Fixes unrelated bug posted into Ticket1821

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 09456d0df13404f004ab3a341d9ac21b7e5e6d6d)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c389ae543a5cf9176ce935ef685f128227525c5e
---

 libavformat/wav.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/libavformat/wav.c b/libavformat/wav.c
index f58bcb3..ec527b8 100644
--- a/libavformat/wav.c
+++ b/libavformat/wav.c
@@ -527,8 +527,7 @@ static int wav_read_header(AVFormatContext *s)
             }
             switch (list_type) {
             case MKTAG('I', 'N', 'F', 'O'):
-                if ((ret = ff_read_riff_info(s, size - 4)) < 0)
-                    return ret;
+                ff_read_riff_info(s, size - 4);
             }
             break;
         }



More information about the ffmpeg-cvslog mailing list