[FFmpeg-cvslog] matroskadec: Fix bug when parsing realaudio codec parameters

James Almer git at videolan.org
Mon Dec 30 00:51:17 CET 2013


ffmpeg | branch: release/2.1 | James Almer <jamrial at gmail.com> | Tue Dec 24 20:26:32 2013 -0300| [b962157ce36f5f764688126ac2a8e6ba5d906d23] | committer: Carl Eugen Hoyos

matroskadec: Fix bug when parsing realaudio codec parameters

flavor can be 0.

This fixes tract ticket #3214

Signed-off-by: James Almer <jamrial at gmail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 0d944ee34349805b29f9c91b15c8009d16df01ab)

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

 libavformat/matroskadec.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index 52e095f..0ed8316 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -1777,7 +1777,7 @@ static int matroska_read_header(AVFormatContext *s)
             track->audio.sub_packet_h    = avio_rb16(&b);
             track->audio.frame_size      = avio_rb16(&b);
             track->audio.sub_packet_size = avio_rb16(&b);
-            if (flavor <= 0 || track->audio.coded_framesize <= 0 ||
+            if (flavor < 0 || track->audio.coded_framesize <= 0 ||
                 track->audio.sub_packet_h <= 0 || track->audio.frame_size <= 0 ||
                 track->audio.sub_packet_size <= 0)
                 return AVERROR_INVALIDDATA;



More information about the ffmpeg-cvslog mailing list