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:
a1ce41c
)
avformat/mpc8: 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/mpc8.c
patch
|
blob
|
history
diff --git
a/libavformat/mpc8.c
b/libavformat/mpc8.c
index
7017c18
..
0e9baaa
100644
(file)
--- a/
libavformat/mpc8.c
+++ b/
libavformat/mpc8.c
@@
-241,9
+241,8
@@
static int mpc8_read_header(AVFormatContext *s)
st->codec->codec_id = AV_CODEC_ID_MUSEPACK8;
st->codec->bits_per_coded_sample = 16;
- if (ff_
alloc_extradata(st->codec, 2)
)
+ if (ff_
get_extradata(st->codec, pb, 2) < 0
)
return AVERROR(ENOMEM);
- avio_read(pb, st->codec->extradata, st->codec->extradata_size);
st->codec->channels = (st->codec->extradata[1] >> 4) + 1;
st->codec->sample_rate = mpc8_rate[st->codec->extradata[0] >> 5];