Mercurial > mplayer.hg

changeset 31986:9986a61354e6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove duplicated audio_output_channels extern variable declaration. It is already available in dec_audio.h, which is better suited.
author diego
date Wed, 08 Sep 2010 17:38:52 +0000
parents 09cd33b66ceb
children e91e0249e2fd
files libmpcodecs/ad_dmo.c libmpcodecs/ad_faad.c libmpcodecs/ad_ffmpeg.c libmpcodecs/ad_internal.h libmpcodecs/ad_liba52.c libmpcodecs/ad_libdca.c
diffstat 6 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/libmpcodecs/ad_dmo.c	Wed Sep 08 17:31:29 2010 +0000
+++ b/libmpcodecs/ad_dmo.c	Wed Sep 08 17:38:52 2010 +0000
@@ -25,6 +25,7 @@
 #include "help_mp.h"
 
 #include "ad_internal.h"
+#include "dec_audio.h"
 #include "libaf/reorder_ch.h"
 
 static const ad_info_t info =
--- a/libmpcodecs/ad_faad.c	Wed Sep 08 17:31:29 2010 +0000
+++ b/libmpcodecs/ad_faad.c	Wed Sep 08 17:38:52 2010 +0000
@@ -26,6 +26,7 @@
 
 #include "config.h"
 #include "ad_internal.h"
+#include "dec_audio.h"
 #include "libaf/reorder_ch.h"
 
 static const ad_info_t info =
--- a/libmpcodecs/ad_ffmpeg.c	Wed Sep 08 17:31:29 2010 +0000
+++ b/libmpcodecs/ad_ffmpeg.c	Wed Sep 08 17:38:52 2010 +0000
@@ -25,6 +25,7 @@
 #include "help_mp.h"
 
 #include "ad_internal.h"
+#include "dec_audio.h"
 #include "vd_ffmpeg.h"
 #include "libaf/reorder_ch.h"
 
--- a/libmpcodecs/ad_internal.h	Wed Sep 08 17:31:29 2010 +0000
+++ b/libmpcodecs/ad_internal.h	Wed Sep 08 17:38:52 2010 +0000
@@ -28,7 +28,6 @@
 
 #include "ad.h"
 
-extern int audio_output_channels;
 static int init(sh_audio_t *sh);
 static int preinit(sh_audio_t *sh);
 static void uninit(sh_audio_t *sh);
--- a/libmpcodecs/ad_liba52.c	Wed Sep 08 17:31:29 2010 +0000
+++ b/libmpcodecs/ad_liba52.c	Wed Sep 08 17:38:52 2010 +0000
@@ -30,6 +30,7 @@
 #include "mpbswap.h"
 
 #include "ad_internal.h"
+#include "dec_audio.h"
 
 #include "cpudetect.h"
 
--- a/libmpcodecs/ad_libdca.c	Wed Sep 08 17:31:29 2010 +0000
+++ b/libmpcodecs/ad_libdca.c	Wed Sep 08 17:38:52 2010 +0000
@@ -29,6 +29,7 @@
 
 #include "mp_msg.h"
 #include "ad_internal.h"
+#include "dec_audio.h"
 
 #include <dts.h>