[FFmpeg-cvslog] r23384 - in branches/0.6: . libavformat/riff.c

[siretart]

Author: siretart
Date: Sat May 29 16:45:13 2010
New Revision: 23384

Log:
Samsung uses SIPP as FourCC for MPEG-4 ASP.

backport r23309 by cehoyos

Modified:
   branches/0.6/   (props changed)
   branches/0.6/libavformat/riff.c

Modified: branches/0.6/libavformat/riff.c
==============================================================================
--- branches/0.6/libavformat/riff.c	Sat May 29 16:41:26 2010	(r23383)
+++ branches/0.6/libavformat/riff.c	Sat May 29 16:45:13 2010	(r23384)
@@ -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') },