Commit 702a5518 authored by Felix Paul Kühne's avatar Felix Paul Kühne

* enabled ffmpeg's beta WMV3/VC1-support

parent cfd2fa8f
......@@ -915,6 +915,7 @@ DISTCLEAN_PKG += libmatroska-$(LIBMATROSKA_VERSION).tar.bz2
ffmpeg:
$(SVN) co $(FFMPEG_SVN) ffmpeg
cd $@;patch -p 0 < ../Patches/ffmpeg-vc1.patch
ifeq ($(HOST),i586-pc-beos)
(cd $@; patch -p 0 < ../Patches/ffmpeg-svn-beos.patch)
endif
......
Index: libavcodec/allcodecs.c
===================================================================
--- libavcodec/allcodecs.c (revision 5823)
+++ libavcodec/allcodecs.c (working copy)
@@ -229,11 +229,9 @@
#ifdef CONFIG_VC1_DECODER
register_avcodec(&vc1_decoder);
#endif //CONFIG_VC1_DECODER
-/* Reenable when it stops crashing on every file, causing bug report spam.
#ifdef CONFIG_WMV3_DECODER
register_avcodec(&wmv3_decoder);
#endif //CONFIG_WMV3_DECODER
-*/
#ifdef CONFIG_H263I_DECODER
register_avcodec(&h263i_decoder);
#endif //CONFIG_H263I_DECODER
......@@ -721,12 +721,11 @@ static struct
VIDEO_ES, "Windows Media Video 1" },
{ VLC_FOURCC('W','M','V','2'), CODEC_ID_WMV2,
VIDEO_ES, "Windows Media Video 2" },
#if 0
{ VLC_FOURCC('W','M','V','3'), CODEC_ID_WMV3,
VIDEO_ES, "Windows Media Video 3" },
{ VLC_FOURCC('W','V','C','1'), CODEC_ID_VC1,
VIDEO_ES, "Windows Media Video VC1" },
#endif
#if 0
/* WMVA is the VC-1 codec before the standardization proces,
it is not bitstream compatible and deprecated */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment