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

[Michael Niedermayer]

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

avformat/rsd: use ff_get_extradata()

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

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

 libavformat/rsd.c |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/libavformat/rsd.c b/libavformat/rsd.c
index 341f638..b6f1686 100644
--- a/libavformat/rsd.c
+++ b/libavformat/rsd.c
@@ -104,13 +104,10 @@ static int rsd_read_header(AVFormatContext *s)
         /* RSD3GADP is mono, so only alloc enough memory
            to store the coeff table for a single channel. */
 
-        if (ff_alloc_extradata(codec, 32))
-            return AVERROR(ENOMEM);
-
         start = avio_rl32(pb);
 
-        if (avio_read(s->pb, codec->extradata, 32) != 32)
-            return AVERROR_INVALIDDATA;
+        if (ff_get_extradata(codec, s->pb, 32) < 0)
+            return AVERROR(ENOMEM);
 
         for (i = 0; i < 16; i++)
             AV_WB16(codec->extradata + i * 2, AV_RL16(codec->extradata + i * 2));