# HG changeset patch
# User compn
# Date 1317464441 0
# Node ID 0d4741369ee1717ea9fa906f9fcfa89c02d12ff6
# Parent  eb8263a3b13110896d5578030b8c2d14a8204434
add some aac/dts fourccs

diff -r eb8263a3b131 -r 0d4741369ee1 etc/codecs.conf
--- a/etc/codecs.conf	Fri Sep 30 21:47:26 2011 +0000
+++ b/etc/codecs.conf	Sat Oct 01 10:20:41 2011 +0000
@@ -4317,6 +4317,7 @@
   info "FFmpeg AAC in LATM"
   status working
   fourcc MP4L ; internal MPlayer FourCC
+  format 0x1602
   driver ffmpeg
   dll aac_latm
 
@@ -4329,6 +4330,7 @@
   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 ffdca
   info "FFmpeg DTS"
   status working
+  fourcc "dts "
+  fourcc "DTS "
+  fourcc dtsb    ;from vlc
+  fourcc dtsc    ;from ffmpeg
   format 0x2001
   format 0x86
   driver ffmpeg
diff -r eb8263a3b131 -r 0d4741369ee1 libmpdemux/demuxer.c
--- a/libmpdemux/demuxer.c	Fri Sep 30 21:47:26 2011 +0000
+++ b/libmpdemux/demuxer.c	Sat Oct 01 10:20:41 2011 +0000
@@ -473,9 +473,11 @@
     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 @@
         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'):