aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/rmdec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-12-25 16:37:42 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-12-25 17:38:29 +0100
commitfd335aa3260d89775e3975d1c28738e79ba4d9d9 (patch)
tree1599a5523b78b2710e2f0bf23cf1e4b5f5f46937 /libavformat/rmdec.c
parent61883a2e896a3e427358b11ed73fbb4fdaf8c739 (diff)
downloadffmpeg-fd335aa3260d89775e3975d1c28738e79ba4d9d9.tar.gz
avformat/rmdec: use ff_get_extradata()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rmdec.c')
-rw-r--r--libavformat/rmdec.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/libavformat/rmdec.c b/libavformat/rmdec.c
index a8af378a8e..23e0f9cc49 100644
--- a/libavformat/rmdec.c
+++ b/libavformat/rmdec.c
@@ -86,11 +86,8 @@ static int rm_read_extradata(AVIOContext *pb, AVCodecContext *avctx, unsigned si
{
if (size >= 1<<24)
return -1;
- if (ff_alloc_extradata(avctx, size))
+ if (ff_get_extradata(avctx, pb, size) < 0)
return AVERROR(ENOMEM);
- avctx->extradata_size = avio_read(pb, avctx->extradata, size);
- if (avctx->extradata_size != size)
- return AVERROR(EIO);
return 0;
}