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:
1ddcd07
)
Use V_MPEG4/ISO/ASP for mpeg4 when muxing mkv
author
David Conrad
<lessen42@gmail.com>
Thu, 6 Sep 2007 05:14:09 +0000
(
05:14
+0000)
committer
David Conrad
<lessen42@gmail.com>
Thu, 6 Sep 2007 05:14:09 +0000
(
05:14
+0000)
Originally committed as revision 10421 to svn://svn.ffmpeg.org/ffmpeg/trunk
libavformat/matroska.c
patch
|
blob
|
history
diff --git
a/libavformat/matroska.c
b/libavformat/matroska.c
index
1d4ed57
..
eded899
100644
(file)
--- a/
libavformat/matroska.c
+++ b/
libavformat/matroska.c
@@
-24,8
+24,8
@@
CodecTags ff_mkv_codec_tags[]={
// {"V_MS/VFW/FOURCC" , CODEC_ID_NONE},
{"V_UNCOMPRESSED" , CODEC_ID_RAWVIDEO},
- {"V_MPEG4/ISO/SP" , CODEC_ID_MPEG4},
{"V_MPEG4/ISO/ASP" , CODEC_ID_MPEG4},
+ {"V_MPEG4/ISO/SP" , CODEC_ID_MPEG4},
{"V_MPEG4/ISO/AP" , CODEC_ID_MPEG4},
{"V_MPEG4/ISO/AVC" , CODEC_ID_H264},
{"V_MPEG4/MS/V3" , CODEC_ID_MSMPEG4V3},