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:
c633aeb
)
avformat/flvdec: 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:24:09 +0000
(17:24 +0100)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/flvdec.c
patch
|
blob
|
history
diff --git
a/libavformat/flvdec.c
b/libavformat/flvdec.c
index
4401652
..
5683ed5
100644
(file)
--- a/
libavformat/flvdec.c
+++ b/
libavformat/flvdec.c
@@
-615,9
+615,8
@@
static int flv_read_close(AVFormatContext *s)
static int flv_get_extradata(AVFormatContext *s, AVStream *st, int size)
{
av_free(st->codec->extradata);
- if (ff_
alloc_extradata(st->codec, size)
)
+ if (ff_
get_extradata(st->codec, s->pb, size) < 0
)
return AVERROR(ENOMEM);
- avio_read(s->pb, st->codec->extradata, st->codec->extradata_size);
return 0;
}