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:
482b204
)
avformat/aiffdec: 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:14:32 +0000
(17:14 +0100)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/aiffdec.c
patch
|
blob
|
history
diff --git
a/libavformat/aiffdec.c
b/libavformat/aiffdec.c
index
6f82d93
..
c362071
100644
(file)
--- a/
libavformat/aiffdec.c
+++ b/
libavformat/aiffdec.c
@@
-278,9
+278,8
@@
static int aiff_read_header(AVFormatContext *s)
case MKTAG('w', 'a', 'v', 'e'):
if ((uint64_t)size > (1<<30))
return -1;
- if (ff_
alloc_extradata(st->codec, size)
)
+ if (ff_
get_extradata(st->codec, pb, size) < 0
)
return AVERROR(ENOMEM);
- avio_read(pb, st->codec->extradata, size);
if (st->codec->codec_id == AV_CODEC_ID_QDM2 && size>=12*4 && !st->codec->block_align) {
st->codec->block_align = AV_RB32(st->codec->extradata+11*4);
aiff->block_duration = AV_RB32(st->codec->extradata+9*4);