OSDN Git Service
(root)
/
coroid
/
libav_saccubus.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e264440
)
matroskadec: add correct extradata offset for V_MS/VFW/FOURCC tracks
author
Aurelien Jacobs
<aurel@gnuage.org>
Mon, 24 Aug 2009 13:43:33 +0000
(13:43 +0000)
committer
Aurelien Jacobs
<aurel@gnuage.org>
Mon, 24 Aug 2009 13:43:33 +0000
(13:43 +0000)
Originally committed as revision 19694 to svn://svn.ffmpeg.org/ffmpeg/trunk
libavformat/matroskadec.c
patch
|
blob
|
history
diff --git
a/libavformat/matroskadec.c
b/libavformat/matroskadec.c
index
0ab1cc9
..
319aea0
100644
(file)
--- a/
libavformat/matroskadec.c
+++ b/
libavformat/matroskadec.c
@@
-1246,6
+1246,7
@@
static int matroska_read_header(AVFormatContext *s, AVFormatParameters *ap)
&& track->codec_priv.data != NULL) {
track->video.fourcc = AV_RL32(track->codec_priv.data + 16);
codec_id = ff_codec_get_id(ff_codec_bmp_tags, track->video.fourcc);
+ extradata_offset = 40;
} else if (!strcmp(track->codec_id, "A_MS/ACM")
&& track->codec_priv.size >= 18
&& track->codec_priv.data != NULL) {