diff options
| author | Reinhard Tartler <siretart@tauware.de> | 2010-05-29 14:45:13 +0000 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2010-05-29 14:45:13 +0000 |
| commit | 55291e37f550097171f7a11871f522580dbf1be5 (patch) | |
| tree | de7f9ade5e7b4a0258b2e146ea53c768a640191e | |
| parent | 1f1d2fa75cd4a900b398e117c5ea8b68d55f23d6 (diff) | |
Samsung uses SIPP as FourCC for MPEG-4 ASP.
backport r23309 by cehoyos
Originally committed as revision 23384 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
| -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 340fd760c0..04b710854a 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -80,6 +80,7 @@ const AVCodecTag ff_codec_bmp_tags[] = { { CODEC_ID_MPEG4, MKTAG('V', 'S', 'P', 'X') }, { CODEC_ID_MPEG4, MKTAG('U', 'L', 'D', 'X') }, { CODEC_ID_MPEG4, MKTAG('G', 'E', 'O', 'V') }, + { CODEC_ID_MPEG4, MKTAG('S', 'I', 'P', 'P') }, /* Samsung SHR-6040 */ { CODEC_ID_MSMPEG4V3, MKTAG('D', 'I', 'V', '3') }, /* default signature when using MSMPEG4 */ { CODEC_ID_MSMPEG4V3, MKTAG('M', 'P', '4', '3') }, { CODEC_ID_MSMPEG4V3, MKTAG('M', 'P', 'G', '3') }, |