[FFmpeg-cvslog] vocdec: do not create the stream in read_header()

[Anton Khirnov]

ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Sun Oct 18 21:21:55 2015 +0200| [9f0b6e6827e21e3477abe1199dc2728e30b8c061] | committer: Anton Khirnov

vocdec: do not create the stream in read_header()

The stream parameters are not known until we read a packet, so postpone
creating it until then.

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

 libavformat/vocdec.c |   13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/libavformat/vocdec.c b/libavformat/vocdec.c
index 35ced25..4599522 100644
--- a/libavformat/vocdec.c
+++ b/libavformat/vocdec.c
@@ -141,7 +141,6 @@ static int voc_read_header(AVFormatContext *s)
     VocDecContext *voc = s->priv_data;
     AVIOContext *pb = s->pb;
     int header_size;
-    AVStream *st;
 
     avio_skip(pb, 20);
     header_size = avio_rl16(pb) - 22;
@@ -150,10 +149,8 @@ static int voc_read_header(AVFormatContext *s)
         return AVERROR(ENOSYS);
     }
     avio_skip(pb, header_size);
-    st = avformat_new_stream(s, NULL);
-    if (!st)
-        return AVERROR(ENOMEM);
-    st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
+
+    s->ctx_flags |= AVFMTCTX_NOHEADER;
 
     voc->remaining_size = 0;
     return 0;
@@ -161,6 +158,12 @@ static int voc_read_header(AVFormatContext *s)
 
 static int voc_read_packet(AVFormatContext *s, AVPacket *pkt)
 {
+    if (!s->nb_streams) {
+        AVStream *st = avformat_new_stream(s, NULL);
+        if (!st)
+            return AVERROR(ENOMEM);
+        st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
+    }
     return ff_voc_get_packet(s, pkt, s->streams[0], 0);
 }