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:
6f7daae
)
avformat/nutdec: 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/nutdec.c
patch
|
blob
|
history
diff --git
a/libavformat/nutdec.c
b/libavformat/nutdec.c
index
4ee5f4d
..
ba9ff02
100644
(file)
--- a/
libavformat/nutdec.c
+++ b/
libavformat/nutdec.c
@@
-418,9
+418,8
@@
static int decode_stream_header(NUTContext *nut)
GET_V(st->codec->extradata_size, tmp < (1 << 30));
if (st->codec->extradata_size) {
- if (ff_
alloc_extradata(st->codec, st->codec->extradata_size)
)
+ if (ff_
get_extradata(st->codec, bc, st->codec->extradata_size) < 0
)
return AVERROR(ENOMEM);
- avio_read(bc, st->codec->extradata, st->codec->extradata_size);
}
if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO) {