[MPlayer-cvslog] r34168 - in trunk: etc/codecs.conf libmpdemux/demuxer.c

[compn]

Author: compn
Date: Sat Oct  1 12:20:41 2011
New Revision: 34168

Log:
add some aac/dts fourccs

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

Modified: trunk/etc/codecs.conf
==============================================================================
--- trunk/etc/codecs.conf	Fri Sep 30 23:47:26 2011	(r34167)
+++ trunk/etc/codecs.conf	Sat Oct  1 12:20:41 2011	(r34168)
@@ -4317,6 +4317,7 @@ audiocodec fflatm
   info "FFmpeg AAC in LATM"
   status working
   fourcc MP4L ; internal MPlayer FourCC
+  format 0x1602
   driver ffmpeg
   dll aac_latm
 
@@ -4329,6 +4330,7 @@ audiocodec ffaac
   fourcc "AACP" ; Used in NSV for AACPlus
   fourcc raac,racp
   format 0xff
+  format 0x1600
   format 0x706D
   format 0x4143 ; aac in asf
   format 0xA106 ; aac in avi not yet working
@@ -4811,6 +4813,10 @@ audiocodec a52
 audiocodec ffdca
   info "FFmpeg DTS"
   status working
+  fourcc "dts "
+  fourcc "DTS "
+  fourcc dtsb    ;from vlc
+  fourcc dtsc    ;from ffmpeg
   format 0x2001
   format 0x86
   driver ffmpeg

Modified: trunk/libmpdemux/demuxer.c
==============================================================================
--- trunk/libmpdemux/demuxer.c	Fri Sep 30 23:47:26 2011	(r34167)
+++ trunk/libmpdemux/demuxer.c	Sat Oct  1 12:20:41 2011	(r34168)
@@ -473,9 +473,11 @@ static void allocate_parser(AVCodecConte
     init_avcodec();
 
     switch (format) {
+    case 0x1600:
     case MKTAG('M', 'P', '4', 'A'):
         codec_id = CODEC_ID_AAC;
         break;
+    case 0x1602:
     case MKTAG('M', 'P', '4', 'L'):
         codec_id = CODEC_ID_AAC_LATM;
         break;
@@ -495,6 +497,10 @@ static void allocate_parser(AVCodecConte
         break;
     case 0x2001:
     case 0x86:
+    case MKTAG('D', 'T', 'S', ' '):
+    case MKTAG('d', 't', 's', ' '):
+    case MKTAG('d', 't', 's', 'b'):
+    case MKTAG('d', 't', 's', 'c'):
         codec_id = CODEC_ID_DTS;
         break;
     case MKTAG('f', 'L', 'a', 'C'):