[MPlayer-cvslog] r34028 - in trunk: etc/codecs.conf libmpdemux/mp_taglists.c

[cehoyos]

Author: cehoyos
Date: Wed Aug 31 11:04:21 2011
New Revision: 34028

Log:
Do not map to internal MPlayer FourCC if possible.

Modified:
   trunk/etc/codecs.conf
   trunk/libmpdemux/mp_taglists.c

Modified: trunk/etc/codecs.conf
==============================================================================
--- trunk/etc/codecs.conf	Mon Aug 29 14:48:21 2011	(r34027)
+++ trunk/etc/codecs.conf	Wed Aug 31 11:04:21 2011	(r34028)
@@ -447,7 +447,7 @@ videocodec mpegpes
 videocodec ffnuv
   info "NuppelVideo"
   status working
-  fourcc NUV1 ; NUV1 is an internal MPlayer FOURCC
+  fourcc NUV1 ; former internal MPlayer FOURCC
   fourcc RJPG
   driver ffmpeg
   dll nuv
@@ -4313,7 +4313,7 @@ audiocodec fftruehd
 audiocodec ffnellymoser
   info "FFmpeg Nellymoser Audio"
   status working
-  fourcc "NELL" ; internal MPlayer FourCC
+  fourcc "NELL" ; former internal MPlayer FourCC
   fourcc nmos
   driver ffmpeg
   dll "nellymoser"

Modified: trunk/libmpdemux/mp_taglists.c
==============================================================================
--- trunk/libmpdemux/mp_taglists.c	Mon Aug 29 14:48:21 2011	(r34027)
+++ trunk/libmpdemux/mp_taglists.c	Wed Aug 31 11:04:21 2011	(r34028)
@@ -42,7 +42,7 @@ static const AVCodecTag mp_wav_tags[] = 
     { CODEC_ID_MP4ALS,            MKTAG('A', 'L', 'S', ' ')},
     { CODEC_ID_MUSEPACK7,         MKTAG('M', 'P', 'C', ' ')},
     { CODEC_ID_MUSEPACK8,         MKTAG('M', 'P', 'C', '8')},
-    { CODEC_ID_NELLYMOSER,        MKTAG('N', 'E', 'L', 'L')},
+    { CODEC_ID_NELLYMOSER,        MKTAG('n', 'm', 'o', 's')},
     { CODEC_ID_PCM_LXF,           MKTAG('P', 'L', 'X', 'F')},
     { CODEC_ID_QCELP,             MKTAG('Q', 'c', 'l', 'p')},
     { CODEC_ID_QDM2,              MKTAG('Q', 'D', 'M', '2')},
@@ -106,7 +106,7 @@ static const AVCodecTag mp_bmp_tags[] = 
     { CODEC_ID_JV,                MKTAG('F', 'F', 'J', 'V')},
     { CODEC_ID_MDEC,              MKTAG('M', 'D', 'E', 'C')},
     { CODEC_ID_MOTIONPIXELS,      MKTAG('M', 'V', 'I', '1')},
-    { CODEC_ID_NUV,               MKTAG('N', 'U', 'V', '1')},
+    { CODEC_ID_NUV,               MKTAG('R', 'J', 'P', 'G')},
     { CODEC_ID_RL2,               MKTAG('R', 'L', '2', 'V')},
     { CODEC_ID_ROQ,               MKTAG('R', 'o', 'Q', 'V')},
     { CODEC_ID_RV10,              MKTAG('R', 'V', '1', '0')},