[FFmpeg-cvslog] avformat/westwood_vqa: use ff_get_extradata()

Michael Niedermayer git at videolan.org
Wed Dec 25 17:48:56 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Dec 25 16:37:42 2013 +0100| [239a0543a66b6b4a67ec5b96081cfa2ec5776da6] | committer: Michael Niedermayer

avformat/westwood_vqa: use ff_get_extradata()

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavformat/westwood_vqa.c |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/libavformat/westwood_vqa.c b/libavformat/westwood_vqa.c
index 1d4bb5a..2a988ad 100644
--- a/libavformat/westwood_vqa.c
+++ b/libavformat/westwood_vqa.c
@@ -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];



More information about the ffmpeg-cvslog mailing list