avformat/westwood_vqa: use ff_get_extradata()
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 25 Dec 2013 15:37:42 +0000 (16:37 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 25 Dec 2013 16:38:30 +0000 (17:38 +0100)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/westwood_vqa.c

index 1d4bb5ad6c6db01e5756953dbd4550226da65a5d..2a988ad3900fd32547e8e78dc2595016716f10af 100644 (file)
@@ -101,13 +101,9 @@ static int wsvqa_read_header(AVFormatContext *s)
     avio_seek(pb, 20, SEEK_SET);
 
     /* the VQA header needs to go to the decoder */
-    if (ff_alloc_extradata(st->codec, VQA_HEADER_SIZE))
+    if (ff_get_extradata(st->codec, pb, VQA_HEADER_SIZE) < 0)
         return AVERROR(ENOMEM);
     header = (uint8_t *)st->codec->extradata;
-    if (avio_read(pb, st->codec->extradata, VQA_HEADER_SIZE) !=
-        VQA_HEADER_SIZE) {
-        return AVERROR(EIO);
-    }
     st->codec->width = AV_RL16(&header[6]);
     st->codec->height = AV_RL16(&header[8]);
     fps = header[12];