Do not return invalid pointer for non-audio or video streams.

Patch by Sam Hocevar sam+ffmpeg zoy org

Originally committed as revision 8564 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/rm.c b/libavformat/rm.c
index b4ddf1b027e668c9663b2ecdb0f44e84f6de9ea6..ad2f5ff27c8b5200ad5cc112460e08ccda24bd29 100644 (file)
--- a/libavformat/rm.c
+++ b/libavformat/rm.c
@@ -954,9 +954,8 @@ resync:
                 len=len2;
             rm->remaining_len-= len;
             av_get_packet(pb, pkt, len);
-        }
 
-        if (st->codec->codec_type == CODEC_TYPE_AUDIO) {
+        } else if (st->codec->codec_type == CODEC_TYPE_AUDIO) {
             if ((st->codec->codec_id == CODEC_ID_RA_288) ||
                 (st->codec->codec_id == CODEC_ID_COOK)) {
                 int x;
@@ -1008,7 +1007,9 @@ resync:
                 }
             } else
                 av_get_packet(pb, pkt, len);
-        }
+
+        } else
+            av_get_packet(pb, pkt, len);
 
         if(  (st->discard >= AVDISCARD_NONKEY && !(flags&2))
            || st->discard >= AVDISCARD_ALL){