[MPlayer-cvslog] r37603 - in trunk: Makefile etc/codecs.conf libmpcodecs/ad.c libmpcodecs/ad_dk3adpcm.c libmpcodecs/ad_imaadpcm.c libmpcodecs/ad_msadpcm.c

[rtogni]

Author: rtogni
Date: Sun Jan 24 00:34:57 2016
New Revision: 37603

Log:
Remove internal audio decoders ad_dk3adpcm, ad_imaadpcm, ad_msadpcm

The formats involved are
 ad_dk3adpcm.c DK3 adpcm
 ad_imaadpcm.c MS ima adpcm, QT ima adpcm, DK4 adpcm
 ad_msadpcm.c MS adpcm

FFmpeg decoder was already preferred for all of them.

Deleted:
   trunk/libmpcodecs/ad_dk3adpcm.c
   trunk/libmpcodecs/ad_imaadpcm.c
   trunk/libmpcodecs/ad_msadpcm.c
Modified:
   trunk/Makefile
   trunk/etc/codecs.conf
   trunk/libmpcodecs/ad.c

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	Sat Jan 23 13:01:31 2016	(r37602)
+++ trunk/Makefile	Sun Jan 24 00:34:57 2016	(r37603)
@@ -293,12 +293,9 @@ SRCS_COMMON = asxparser.c
               libaf/window.c                    \
               libmpcodecs/ad.c                  \
               libmpcodecs/ad_alaw.c             \
-              libmpcodecs/ad_dk3adpcm.c         \
               libmpcodecs/ad_dvdpcm.c           \
               libmpcodecs/ad_hwac3.c            \
               libmpcodecs/ad_hwmpa.c            \
-              libmpcodecs/ad_imaadpcm.c         \
-              libmpcodecs/ad_msadpcm.c          \
               libmpcodecs/ad_pcm.c              \
               libmpcodecs/dec_audio.c           \
               libmpcodecs/dec_teletext.c        \

Modified: trunk/etc/codecs.conf
==============================================================================
--- trunk/etc/codecs.conf	Sat Jan 23 13:01:31 2016	(r37602)
+++ trunk/etc/codecs.conf	Sun Jan 24 00:34:57 2016	(r37603)
@@ -4924,14 +4924,6 @@ audiocodec ffadpcmimawav
   driver ffmpeg
   dll adpcm_ima_wav
 
-audiocodec imaadpcm
-  info "IMA ADPCM"
-  status working
-  format 0x11
-  fourcc ima4 ; (MOV files)
-  format 0x1100736d ; "ms\x00\x11" (MOV files)
-  driver imaadpcm
-
 audiocodec ffzorkpcm
   info "FFmpeg PCM Zork audio"
   status working
@@ -4948,13 +4940,6 @@ audiocodec ffadpcmms
   driver ffmpeg
   dll adpcm_ms
 
-audiocodec msadpcm
-  info "MS ADPCM"
-  status working
-  format 0x2
-  format 0x0200736d  ; "ms\x00\x02" (MOV files)
-  driver msadpcm
-
 audiocodec ffadpcmoki
   info "FFmpeg ADPCM IMA Dialogic OKI"
   status working
@@ -4999,13 +4984,6 @@ audiocodec ffadpcmimadk4
   driver ffmpeg
   dll adpcm_ima_dk4
 
-audiocodec dk4adpcm
-  info "Duck DK4 ADPCM (rogue format number)"
-  status working
-  format 0x61 ; This format number was used by Duck Corp. but not officially
-              ; registered with Microsoft
-  driver imaadpcm
-
 audiocodec ffadpcmimadk3
   info "FFmpeg DK3 IMA ADPCM audio"
   status working
@@ -5035,13 +5013,6 @@ audiocodec ffadpcmimaeaeacs
   driver ffmpeg
   dll adpcm_ima_ea_eacs
 
-audiocodec dk3adpcm
-  info "Duck DK3 ADPCM (rogue format number)"
-  status working
-  format 0x62 ; This format number was used by Duck Corp. but not officially
-              ; registered with Microsoft
-  driver dk3adpcm
-
 audiocodec ffroqaudio
   info "Id RoQ File Audio"
   status working

Modified: trunk/libmpcodecs/ad.c
==============================================================================
--- trunk/libmpcodecs/ad.c	Sat Jan 23 13:01:31 2016	(r37602)
+++ trunk/libmpcodecs/ad.c	Sun Jan 24 00:34:57 2016	(r37603)
@@ -41,9 +41,6 @@ extern const ad_functions_t mpcodecs_ad_
 extern const ad_functions_t mpcodecs_ad_pcm;
 extern const ad_functions_t mpcodecs_ad_dvdpcm;
 extern const ad_functions_t mpcodecs_ad_alaw;
-extern const ad_functions_t mpcodecs_ad_imaadpcm;
-extern const ad_functions_t mpcodecs_ad_msadpcm;
-extern const ad_functions_t mpcodecs_ad_dk3adpcm;
 extern const ad_functions_t mpcodecs_ad_dk4adpcm;
 extern const ad_functions_t mpcodecs_ad_dshow;
 extern const ad_functions_t mpcodecs_ad_dmo;
@@ -77,9 +74,6 @@ const ad_functions_t * const mpcodecs_ad
   &mpcodecs_ad_pcm,
   &mpcodecs_ad_dvdpcm,
   &mpcodecs_ad_alaw,
-  &mpcodecs_ad_imaadpcm,
-  &mpcodecs_ad_msadpcm,
-  &mpcodecs_ad_dk3adpcm,
 #ifdef CONFIG_WIN32DLL
   &mpcodecs_ad_dshow,
   &mpcodecs_ad_dmo,