[FFmpeg-cvslog] lavf/matroskadec: Fix demuxing sipr.

[Carl Eugen Hoyos]

ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Tue Feb 28 21:51:26 2017 +0100| [b8a7dcbde2e1ed99bf07a83b1ddf47d7895360ad] | committer: Carl Eugen Hoyos

lavf/matroskadec: Fix demuxing sipr.

Regression since 2c8d876d

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

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

diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index 7223e94..11265fb 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -2289,7 +2289,7 @@ static int matroska_parse_tracks(AVFormatContext *s)
                 track->audio.coded_framesize <= 0 ||
                 track->audio.sub_packet_h    <= 0 ||
                 track->audio.frame_size      <= 0 ||
-                track->audio.sub_packet_size <= 0)
+                track->audio.sub_packet_size <= 0 && codec_id != AV_CODEC_ID_SIPR)
                 return AVERROR_INVALIDDATA;
             track->audio.buf = av_malloc_array(track->audio.sub_packet_h,
                                                track->audio.frame_size);