diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-09 20:33:06 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-09 20:33:51 +0200 |
| commit | e77270cd93e1e77e99fb6d210e3bea0db9909ac4 (patch) | |
| tree | d2749a537b6a2f91b4ca65325534cac6da19c425 | |
| parent | 72a580268ff92b1909102b26c1c5fce9086f20e4 (diff) | |
| parent | 783df7d5c5ab15f3d1afe2541c7d461c81c5c29d (diff) | |
| download | ffmpeg-e77270cd93e1e77e99fb6d210e3bea0db9909ac4.tar.gz | |
Merge commit '783df7d5c5ab15f3d1afe2541c7d461c81c5c29d'
* commit '783df7d5c5ab15f3d1afe2541c7d461c81c5c29d':
riff: Add 'M705' FourCC for mpeg2video
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/riff.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/riff.c b/libavformat/riff.c index eb58ecc91e..440a36b309 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -164,6 +164,7 @@ const AVCodecTag ff_codec_bmp_tags[] = { { AV_CODEC_ID_MPEG2VIDEO, MKTAG('E', 'M', '2', 'V') }, /* Matrox MPEG-2 intra-only */ { AV_CODEC_ID_MPEG2VIDEO, MKTAG('M', '7', '0', '1') }, + { AV_CODEC_ID_MPEG2VIDEO, MKTAG('M', '7', '0', '5') }, { 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 */ |