Author: faust3 Date: Sat Jul 4 12:27:38 2009 New Revision: 4592 Log: update ffmpeg patch, TODO and checkout script Deleted: wmapro/TODO Modified: wmapro/checkout.sh wmapro/wmapro_ffmpeg.patch Modified: wmapro/checkout.sh ============================================================================== --- wmapro/checkout.sh Sat Jul 4 12:16:02 2009 (r4591) +++ wmapro/checkout.sh Sat Jul 4 12:27:38 2009 (r4592) @@ -1,9 +1,8 @@ #!/bin/sh svn co svn://svn.ffmpeg.org/ffmpeg/trunk ffmpeg cd ffmpeg/libavcodec -ln -s ../../wma3dec.c wma3dec.c -ln -s ../../wma3data.h wma3data.h -ln -s ../../wma3.h wma3.h +ln -s ../../wmaprodec.c wmaprodec.c +ln -s ../../wmaprodata.h wmaprodata.h cd ../ patch -p0 <../wmapro_ffmpeg.patch patch -p0 <../audioframesize.patch Modified: wmapro/wmapro_ffmpeg.patch ============================================================================== --- wmapro/wmapro_ffmpeg.patch Sat Jul 4 12:16:02 2009 (r4591) +++ wmapro/wmapro_ffmpeg.patch Sat Jul 4 12:27:38 2009 (r4592) @@ -1,24 +1,60 @@ +Index: Changelog +=================================================================== +--- Changelog (revision 19340) ++++ Changelog (working copy) +@@ -26,6 +26,7 @@ + - DPX image decoder + - Electronic Arts Madcow decoder + - DivX (XSUB) subtitle encoder ++- Wmapro decoder + + + +Index: libavcodec/allcodecs.c +=================================================================== +--- libavcodec/allcodecs.c (revision 19340) ++++ libavcodec/allcodecs.c (working copy) +@@ -233,6 +233,7 @@ + REGISTER_DECODER (WAVPACK, wavpack); + REGISTER_ENCDEC (WMAV1, wmav1); + REGISTER_ENCDEC (WMAV2, wmav2); ++ REGISTER_DECODER (WMAPRO, wmapro); + REGISTER_DECODER (WS_SND1, ws_snd1); + + /* PCM codecs */ Index: libavcodec/Makefile =================================================================== ---- libavcodec/Makefile (revision 16517) +--- libavcodec/Makefile (revision 19340) +++ libavcodec/Makefile (working copy) -@@ -233,6 +233,7 @@ +@@ -259,6 +259,7 @@ OBJS-$(CONFIG_WMAV1_ENCODER) += wmaenc.o wma.o OBJS-$(CONFIG_WMAV2_DECODER) += wmadec.o wma.o OBJS-$(CONFIG_WMAV2_ENCODER) += wmaenc.o wma.o -+OBJS-$(CONFIG_WMAPRO_DECODER) += wma3dec.o ++OBJS-$(CONFIG_WMAPRO_DECODER) += wmaprodec.o wma.o OBJS-$(CONFIG_WMV1_DECODER) += h263dec.o h263.o mpeg12data.o mpegvideo.o error_resilience.o OBJS-$(CONFIG_WMV1_ENCODER) += mpegvideo_enc.o motion_est.o ratecontrol.o h263.o mpeg12data.o mpegvideo.o error_resilience.o OBJS-$(CONFIG_WMV2_DECODER) += wmv2dec.o wmv2.o msmpeg4.o msmpeg4data.o h263dec.o h263.o intrax8.o intrax8dsp.o mpeg12data.o mpegvideo.o error_resilience.o -Index: libavcodec/allcodecs.c +Index: doc/general.texi =================================================================== ---- libavcodec/allcodecs.c (revision 16517) -+++ libavcodec/allcodecs.c (working copy) -@@ -211,6 +211,7 @@ - REGISTER_DECODER (WAVPACK, wavpack); - REGISTER_ENCDEC (WMAV1, wmav1); - REGISTER_ENCDEC (WMAV2, wmav2); -+ REGISTER_DECODER (WMAPRO, wmapro); - REGISTER_DECODER (WS_SND1, ws_snd1); +--- doc/general.texi (revision 19340) ++++ doc/general.texi (working copy) +@@ -632,6 +632,7 @@ + @item Westwood Audio (SND1) @tab @tab X + @item Windows Media Audio 1 @tab X @tab X + @item Windows Media Audio 2 @tab X @tab X ++@item Windows Media Audio Pro @tab @tab X + @end multitable - /* PCM codecs */ + @code{X} means that encoding (resp. decoding) is supported. +Index: MAINTAINERS +=================================================================== +--- MAINTAINERS (revision 19340) ++++ MAINTAINERS (working copy) +@@ -200,6 +200,7 @@ + vp6 Aurelien Jacobs + vqavideo.c Mike Melanson + wavpack.c Kostya Shishkov ++ wmaprodec.c Sascha Sommer + wmv2.c Michael Niedermayer + wnv1.c Kostya Shishkov + xan.c Mike Melanson