projects
/
libav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
771cb3e
)
riff: Support XMPG as mpeg1
author
Michael Niedermayer
<michaelni@gmx.at>
Thu, 3 Apr 2014 13:31:46 +0000
(15:31 +0200)
committer
Vittorio Giovara
<vittorio.giovara@gmail.com>
Thu, 3 Apr 2014 23:29:26 +0000
(
01:29
+0200)
libavformat/riff.c
patch
|
blob
|
blame
|
history
diff --git
a/libavformat/riff.c
b/libavformat/riff.c
index
7a5f1f4
..
7396fc3
100644
(file)
--- a/
libavformat/riff.c
+++ b/
libavformat/riff.c
@@
-163,6
+163,7
@@
const AVCodecTag ff_codec_bmp_tags[] = {
{ AV_CODEC_ID_MPEG2VIDEO, MKTAG('M', '7', '0', '1') },
{ AV_CODEC_ID_MPEG2VIDEO, MKTAG('m', 'p', 'g', 'v') },
{ AV_CODEC_ID_MPEG1VIDEO, MKTAG('B', 'W', '1', '0') },
+ { AV_CODEC_ID_MPEG1VIDEO, MKTAG('X', 'M', 'P', 'G') }, /* Xing MPEG intra only */
{ AV_CODEC_ID_MJPEG, MKTAG('M', 'J', 'P', 'G') },
{ AV_CODEC_ID_MJPEG, MKTAG('L', 'J', 'P', 'G') },
{ AV_CODEC_ID_MJPEG, MKTAG('d', 'm', 'b', '1') },