[FFmpeg-cvslog] r3d: fix an invalid read introduced in 6bf4c1d
Anton Khirnov
git at videolan.org
Fri Jan 1 17:22:33 CET 2016
ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Sun Dec 13 07:13:37 2015 +0100| [5bc223b15d064e328ff90b0241fa1191f1d2786d] | committer: Anton Khirnov
r3d: fix an invalid read introduced in 6bf4c1d
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5bc223b15d064e328ff90b0241fa1191f1d2786d
---
libavformat/r3d.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavformat/r3d.c b/libavformat/r3d.c
index fb066a6..9db1d4b 100644
--- a/libavformat/r3d.c
+++ b/libavformat/r3d.c
@@ -352,7 +352,7 @@ static int r3d_read_packet(AVFormatContext *s, AVPacket *pkt)
case MKTAG('R','E','D','A'):
if (!r3d->audio_channels)
return -1;
- if (s->streams[1]->discard == AVDISCARD_ALL)
+ if (s->nb_streams >= 2 && s->streams[1]->discard == AVDISCARD_ALL)
goto skip;
if (!(err = r3d_read_reda(s, pkt, &atom)))
return 0;
More information about the ffmpeg-cvslog
mailing list