From 751333eb63c5d57ab9b9c83197862114102b70e7 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Thu, 2 Aug 2012 20:56:02 +0200
Subject: Revert "codecs: prefer libmad over libmpg123"

This reverts commit c8b0f2115447f2fdd5bb8090d06153a4bf72d9ff.

This was a very bad idea. It caused A/V desync with some crappy AVI
files, and upon inspecting ad_mad.c, it seems all hope is lost.
Go back to the prefering the mpg123 & libav codecs.
---
 etc/codecs.conf | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'etc')

diff --git a/etc/codecs.conf b/etc/codecs.conf
index e4618a92d0..ca07082839 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -4160,18 +4160,6 @@ audiocodec ffsonic
   driver ffmpeg
   dll "sonic"
 
-audiocodec mad
-  info "libMAD MPEG layer 1-2-3"
-  status working
-  format 0x50
-  format 0x55
-  format 0x5500736d  ; "ms\0\x55" older mp3 fcc (MOV files)
-  fourcc ".mp3"      ; CBR/VBR MP3 (MOV files)
-  fourcc "MP3 "      ; used in .nsv files
-  fourcc "LAME"      ; used in mythtv .nuv files
-  driver libmad
-  dll "libmad"
-
 audiocodec mpg123
   ; this is preferred over ffmp2/ffmp3 since it is faster, generally
   info "MPEG 1.0/2.0/2.5 layers I, II, III"
@@ -4269,6 +4257,18 @@ audiocodec ffmp2
   driver ffmpeg
   dll "mp2"
 
+audiocodec mad
+  info "libMAD MPEG layer 1-2-3"
+  status working
+  format 0x50
+  format 0x55
+  format 0x5500736d  ; "ms\0\x55" older mp3 fcc (MOV files)
+  fourcc ".mp3"      ; CBR/VBR MP3 (MOV files)
+  fourcc "MP3 "      ; used in .nsv files
+  fourcc "LAME"      ; used in mythtv .nuv files
+  driver libmad
+  dll "libmad"
+
 audiocodec mp3acm
   info "MPEG layer-3"
   status working
-- 
cgit v1.2.3