aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-11-23 23:35:16 +0100
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2012-12-10 00:48:15 +0100
commitf1156fdc02343db9df0552fc660cd5c5eb8f47a6 (patch)
treed6ac2a2f20f8cd21b3693bfd8d4c4c59a4541b57
parent1a5b7ce0ea676aa5811a19660724dbc446d0e988 (diff)
downloadffmpeg-f1156fdc02343db9df0552fc660cd5c5eb8f47a6.tar.gz
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@gmx.at> (cherry picked from commit 09456d0df13404f004ab3a341d9ac21b7e5e6d6d)
-rw-r--r--libavformat/wav.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/libavformat/wav.c b/libavformat/wav.c
index 9d4b0708b8..2080d8e664 100644
--- a/libavformat/wav.c
+++ b/libavformat/wav.c
@@ -513,8 +513,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;
}