diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2010-02-25 18:06:31 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2010-02-25 18:06:31 +0000 |
| commit | 032fc4e2349ca6d047110311eb8f69b4556ee3e6 (patch) | |
| tree | 883de3a526f32753b308f1b81e5ad69ad063bb53 | |
| parent | 5dc1f14b931db97076d32bb1285354fa304ebae2 (diff) | |
| download | xine-lib-032fc4e2349ca6d047110311eb8f69b4556ee3e6.tar.gz xine-lib-032fc4e2349ca6d047110311eb8f69b4556ee3e6.tar.bz2 | |
Fix build with the old, outdated and deprecated internal ffmpeg.
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/combined/ffmpeg/ffmpeg_decoder.c | 1 |
3 files changed, 3 insertions, 1 deletions
@@ -2,6 +2,7 @@ xine-lib (1.1.18.1) 2010-??-?? * Oops. compat.c (for DXR3 support) was omitted. * Fix up V4L/V4L2 compilation. Some non-Linux have V4L2 but not V4L. * Fix a size check (wrong variable, causing int/ptr comparison) in rmff.c. + * Fix build with the old, outdated and deprecated internal ffmpeg. xine-lib (1.1.18) 2010-02-23 * Bump the FLAC decoder's priority above ffmpegaudio. This should fix diff --git a/configure.ac b/configure.ac index f5310590c..b098aaa5f 100644 --- a/configure.ac +++ b/configure.ac @@ -3008,8 +3008,10 @@ echo " * audio decoder plugins:" echo " - GSM 06.10 - linear PCM" if test "x$with_external_ffmpeg" = "xyes"; then echo " - ffmpeg (external library):" + echo " - Windows Media Audio v1/v2/Pro" else echo " - ffmpeg (internal library):" + echo " - Windows Media Audio v1/v2" fi echo " - Windows Media Audio v1/v2/Pro" echo " - DV - logarithmic PCM" diff --git a/src/combined/ffmpeg/ffmpeg_decoder.c b/src/combined/ffmpeg/ffmpeg_decoder.c index adf0dad78..6d0bfa432 100644 --- a/src/combined/ffmpeg/ffmpeg_decoder.c +++ b/src/combined/ffmpeg/ffmpeg_decoder.c @@ -228,7 +228,6 @@ void avcodec_register_all(void) REGISTER_DECODER(WAVPACK, wavpack); REGISTER_DECODER(WMAV1, wmav1); REGISTER_DECODER(WMAV2, wmav2); - REGISTER_DECODER(WMAPRO, wmapro); REGISTER_DECODER(WS_SND1, ws_snd1); /* pcm codecs */ |