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:
3e5a7df
)
avformat/mpc: 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/mpc.c
patch
|
blob
|
history
diff --git
a/libavformat/mpc.c
b/libavformat/mpc.c
index
8abc488
..
c3faebe
100644
(file)
--- a/
libavformat/mpc.c
+++ b/
libavformat/mpc.c
@@
-95,9
+95,8
@@
static int mpc_read_header(AVFormatContext *s)
st->codec->channel_layout = AV_CH_LAYOUT_STEREO;
st->codec->bits_per_coded_sample = 16;
- if (ff_
alloc_extradata(st->codec, 16)
)
+ if (ff_
get_extradata(st->codec, s->pb, 16) < 0
)
return AVERROR(ENOMEM);
- avio_read(s->pb, st->codec->extradata, 16);
st->codec->sample_rate = mpc_rate[st->codec->extradata[2] & 3];
avpriv_set_pts_info(st, 32, MPC_FRAMESIZE, st->codec->sample_rate);
/* scan for seekpoints */