Made internal AMR audio decoder optional

git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@1270 10f7b99b-c216-0410-bff0-8a66a9350fd8

1 files changed, 14 insertions, 11 deletions

diff --git a/src/apps/mplayerc/internal_filter_config.h b/src/apps/mplayerc/internal_filter_config.h
index c49b76fa8..56781b5c8 100644
--- a/src/apps/mplayerc/internal_filter_config.h
+++ b/src/apps/mplayerc/internal_filter_config.h
@@ -24,7 +24,7 @@
 

 #pragma once

 

-// Internal splitters

+// Internal source filters

 #define INTERNAL_SOURCEFILTER_AVI       1

 #define INTERNAL_SOURCEFILTER_CDDA      1

 #define INTERNAL_SOURCEFILTER_CDXA      1

@@ -45,30 +45,33 @@
 #define INTERNAL_SOURCEFILTER_ROQ       1

 #define INTERNAL_SOURCEFILTER_UDP       1

 #define INTERNAL_SOURCEFILTER_AVI2AC3   1

-

 #define INTERNAL_SOURCEFILTER_RADGT     0

 #define INTERNAL_SOURCEFILTER_NUT       0

 #define INTERNAL_SOURCEFILTER_DIRAC     0

 

-// Internal decoders

+// Internal audio decoders

 #define INTERNAL_DECODER_AAC            1

-#define INTERNAL_DECODER_AC3            1

 #define INTERNAL_DECODER_DTS            1

 #define INTERNAL_DECODER_LPCM           1

 #define INTERNAL_DECODER_MPEGAUDIO      1

-#define INTERNAL_DECODER_MPEG1          1

-#define INTERNAL_DECODER_MPEG2          1

 #define INTERNAL_DECODER_PS2AUDIO       1

-#define INTERNAL_DECODER_REALVIDEO      1

 #define INTERNAL_DECODER_REALAUDIO      1

 #define INTERNAL_DECODER_VORBIS         1

 #define INTERNAL_DECODER_FLAC           1

+

+// Internal audio decoders (FFmpeg)

+#define INTERNAL_DECODER_AC3            1 /* also E-AC3,TrueHD,MLP */

 #define INTERNAL_DECODER_NELLYMOSER     1

-#define INTERNAL_DECODER_ROQ            1

+#define INTERNAL_DECODER_AMR            1

 

+// Internal video decoders

+#define INTERNAL_DECODER_MPEG1          1

+#define INTERNAL_DECODER_MPEG2          1

+#define INTERNAL_DECODER_REALVIDEO      1

+#define INTERNAL_DECODER_ROQ            1

 #define INTERNAL_DECODER_DIRAC          0

 

-// FFMPEG based internal decoders

+// Internal video decoders (FFmpeg)

 #define INTERNAL_DECODER_H264           1

 #define INTERNAL_DECODER_VC1            1

 #define INTERNAL_DECODER_FLV            1

@@ -85,8 +88,8 @@
 #define INCLUDE_MPC_VIDEO_DECODER  (INTERNAL_DECODER_H264|INTERNAL_DECODER_VC1|INTERNAL_DECODER_FLV|INTERNAL_DECODER_VP6|INTERNAL_DECODER_DIVX|INTERNAL_DECODER_XVID|INTERNAL_DECODER_WMV|INTERNAL_DECODER_MSMPEG4|INTERNAL_DECODER_SVQ|INTERNAL_DECODER_H263|INTERNAL_DECODER_THEORA|INTERNAL_DECODER_AMVV)

 

 // DXVA decoders

-#define INTERNAL_DECODER_H264_DXVA     1

-#define INTERNAL_DECODER_VC1_DXVA      1

+#define INTERNAL_DECODER_H264_DXVA      1

+#define INTERNAL_DECODER_VC1_DXVA       1

 

 #define INCLUDE_MPC_DXVA_VIDEO_DECODER (INTERNAL_DECODER_H264_DXVA|INTERNAL_DECODER_VC1_DXVA)