[MPlayer-cvslog] r31657 - in trunk: Makefile etc/codecs.conf libmpcodecs/ad.c libmpcodecs/ad_msgsm.c libmpcodecs/native/xa_gsm.c libmpcodecs/native/xa_gsm.h libmpcodecs/native/xa_gsm_int.h

[reimar]

Author: reimar
Date: Sat Jul 10 10:04:48 2010
New Revision: 31657

Log:
Remove copy of old and ugly libgsm code and wrapper.
Decoding these formats is supported via FFmpeg both natively and
through libgsm.

Deleted:
   trunk/libmpcodecs/ad_msgsm.c
   trunk/libmpcodecs/native/xa_gsm.c
   trunk/libmpcodecs/native/xa_gsm.h
   trunk/libmpcodecs/native/xa_gsm_int.h
Modified:
   trunk/Makefile
   trunk/etc/codecs.conf
   trunk/libmpcodecs/ad.c

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	Sat Jul 10 09:57:06 2010	(r31656)
+++ trunk/Makefile	Sat Jul 10 10:04:48 2010	(r31657)
@@ -383,14 +383,12 @@ SRCS_COMMON = asxparser.c \
               libmpcodecs/ad_hwmpa.c \
               libmpcodecs/ad_imaadpcm.c \
               libmpcodecs/ad_msadpcm.c \
-              libmpcodecs/ad_msgsm.c \
               libmpcodecs/ad_pcm.c \
               libmpcodecs/dec_audio.c \
               libmpcodecs/dec_teletext.c \
               libmpcodecs/dec_video.c \
               libmpcodecs/img_format.c \
               libmpcodecs/mp_image.c \
-              libmpcodecs/native/xa_gsm.c \
               libmpcodecs/pullup.c \
               libmpcodecs/vd.c \
               libmpcodecs/vd_hmblck.c \

Modified: trunk/etc/codecs.conf
==============================================================================
--- trunk/etc/codecs.conf	Sat Jul 10 09:57:06 2010	(r31656)
+++ trunk/etc/codecs.conf	Sat Jul 10 10:04:48 2010	(r31657)
@@ -4316,16 +4316,6 @@ audiocodec libgsmms
   driver ffmpeg
   dll "libgsm_ms"
 
-audiocodec msgsm
-  info "MS GSM"
-  status working
-  format 0x31
-  format 0x32
-  format 0x204D5347
-  format 0x1500
-  fourcc agsm
-  driver msgsm
-
 audiocodec msgsmacm
   info "MS GSM"
   status working

Modified: trunk/libmpcodecs/ad.c
==============================================================================
--- trunk/libmpcodecs/ad.c	Sat Jul 10 09:57:06 2010	(r31656)
+++ trunk/libmpcodecs/ad.c	Sat Jul 10 10:04:48 2010	(r31657)
@@ -50,7 +50,6 @@ extern const ad_functions_t mpcodecs_ad_
 extern const ad_functions_t mpcodecs_ad_dshow;
 extern const ad_functions_t mpcodecs_ad_dmo;
 extern const ad_functions_t mpcodecs_ad_acm;
-extern const ad_functions_t mpcodecs_ad_msgsm;
 extern const ad_functions_t mpcodecs_ad_faad;
 extern const ad_functions_t mpcodecs_ad_libvorbis;
 extern const ad_functions_t mpcodecs_ad_speex;
@@ -85,7 +84,6 @@ const ad_functions_t * const mpcodecs_ad
   &mpcodecs_ad_imaadpcm,
   &mpcodecs_ad_msadpcm,
   &mpcodecs_ad_dk3adpcm,
-  &mpcodecs_ad_msgsm,
 #ifdef CONFIG_WIN32DLL
   &mpcodecs_ad_dshow,
   &mpcodecs_ad_dmo,