Module: libav
Branch: master
Commit: 5bc223b15d064e328ff90b0241fa1191f1d2786d

Author:    Anton Khirnov <[email protected]>
Committer: Anton Khirnov <[email protected]>
Date:      Sun Dec 13 07:13:37 2015 +0100

r3d: fix an invalid read introduced in 6bf4c1d

---

 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;

_______________________________________________
libav-commits mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-commits

Reply via email to