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:
fd335aa
)
avformat/rsd: 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:30 +0000
(17:38 +0100)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/rsd.c
patch
|
blob
|
history
diff --git
a/libavformat/rsd.c
b/libavformat/rsd.c
index
341f638
..
b6f1686
100644
(file)
--- a/
libavformat/rsd.c
+++ b/
libavformat/rsd.c
@@
-104,13
+104,10
@@
static int rsd_read_header(AVFormatContext *s)
/* RSD3GADP is mono, so only alloc enough memory
to store the coeff table for a single channel. */
- if (ff_alloc_extradata(codec, 32))
- return AVERROR(ENOMEM);
-
start = avio_rl32(pb);
- if (
avio_read(s->pb, codec->extradata, 32) != 32
)
- return AVERROR
_INVALIDDATA
;
+ if (
ff_get_extradata(codec, s->pb, 32) < 0
)
+ return AVERROR
(ENOMEM)
;
for (i = 0; i < 16; i++)
AV_WB16(codec->extradata + i * 2, AV_RL16(codec->extradata + i * 2));