Commit 87a71d24 authored by Christophe Mutricy's avatar Christophe Mutricy

fix breakqge introduce in [16152]

parent 525b810c
......@@ -915,7 +915,7 @@ DISTCLEAN_PKG += libmatroska-$(LIBMATROSKA_VERSION).tar.bz2
ffmpeg:
$(SVN) co $(FFMPEG_SVN) ffmpeg
cd $@;patch -p 0 < ../Patches/ffmpeg-vc1.patch
(cd $@;patch -p 0 < ../Patches/ffmpeg-vc1.patch)
ifeq ($(HOST),i586-pc-beos)
(cd $@; patch -p 0 < ../Patches/ffmpeg-svn-beos.patch)
endif
......
......@@ -14,3 +14,18 @@ Index: libavcodec/allcodecs.c
#ifdef CONFIG_H263I_DECODER
register_avcodec(&h263i_decoder);
#endif //CONFIG_H263I_DECODER
Index: libavcodec/avcodec.h
===================================================================
--- libavcodec/avcodec.h (revision 5852)
+++ libavcodec/avcodec.h (working copy)
@@ -17,8 +17,8 @@
#define AV_STRINGIFY(s) AV_TOSTRING(s)
#define AV_TOSTRING(s) #s
-#define LIBAVCODEC_VERSION_INT ((51<<16)+(10<<8)+0)
-#define LIBAVCODEC_VERSION 51.10.0
+#define LIBAVCODEC_VERSION_INT ((51<<16)+(10<<8)+1)
+#define LIBAVCODEC_VERSION 51.10.1
#define LIBAVCODEC_BUILD LIBAVCODEC_VERSION_INT
#define LIBAVCODEC_IDENT "Lavc" AV_STRINGIFY(LIBAVCODEC_VERSION)
......@@ -721,11 +721,12 @@ static struct
VIDEO_ES, "Windows Media Video 1" },
{ VLC_FOURCC('W','M','V','2'), CODEC_ID_WMV2,
VIDEO_ES, "Windows Media Video 2" },
#if LIBAVCODEC_BUILD >= ((51<<16)+(10<<8)+1)
{ 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