OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
61883a2
)
avformat/rmdec: use ff_get_extradata()
author
Michael Niedermayer
<michaelni@gmx.at>
Wed, 25 Dec 2013 15:37:42 +0000
(16:37 +0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Wed, 25 Dec 2013 16:38:29 +0000
(17:38 +0100)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/rmdec.c
patch
|
blob
|
history
diff --git
a/libavformat/rmdec.c
b/libavformat/rmdec.c
index
a8af378
..
23e0f9c
100644
(file)
--- 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;
}