OSDN Git Service

avformat/rl2: 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:29 +0000 (17:38 +0100)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/rl2.c

index 56f4cf2..d354339 100644 (file)
@@ -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) {