From: Michael Niedermayer <michaelni@gmx.at>
Date: Wed, 25 Dec 2013 15:37:42 +0000 (+0100)
Subject: avformat/rl2: use ff_get_extradata()
X-Git-Tag: android-x86-6.0-r1~8101
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=61883a2e896a3e427358b11ed73fbb4fdaf8c739;p=android-x86%2Fexternal-ffmpeg.git

avformat/rl2: use ff_get_extradata()

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

diff --git a/libavformat/rl2.c b/libavformat/rl2.c
index 56f4cf29ff..d354339ea3 100644
--- a/libavformat/rl2.c
+++ b/libavformat/rl2.c
@@ -127,13 +127,9 @@ static av_cold int rl2_read_header(AVFormatContext *s)
     if(signature == RLV3_TAG && back_size > 0)
         st->codec->extradata_size += back_size;
 
-    if(ff_alloc_extradata(st->codec, st->codec->extradata_size))
+    if(ff_get_extradata(st->codec, pb, st->codec->extradata_size) < 0)
         return AVERROR(ENOMEM);
 
-    if(avio_read(pb,st->codec->extradata,st->codec->extradata_size) !=
-                      st->codec->extradata_size)
-        return AVERROR(EIO);
-
     /** setup audio stream if present */
     if(sound_rate){
         if (!channels || channels > 42) {