Commit c0706bdd authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Contrib: dirac update!

parent 3bceb9cf
...@@ -2204,7 +2204,6 @@ dirac-$(DIRAC_VERSION).tar.gz: ...@@ -2204,7 +2204,6 @@ dirac-$(DIRAC_VERSION).tar.gz:
dirac: dirac-$(DIRAC_VERSION).tar.gz dirac: dirac-$(DIRAC_VERSION).tar.gz
$(EXTRACT_GZ) $(EXTRACT_GZ)
patch -p1 -d dirac <Patches/dirac-cross.patch
ifdef HAVE_CYGWIN ifdef HAVE_CYGWIN
# incorrect compile warning with cygwin compiler 3.4.4 # incorrect compile warning with cygwin compiler 3.4.4
patch -p0 <Patches/dirac-cygwin.patch patch -p0 <Patches/dirac-cygwin.patch
......
diff --git a/libdirac_common/band_codec.cpp b/libdirac_common/band_codec.cpp
index f750906..bfe6e75 100644
--- a/libdirac_common/band_codec.cpp
+++ b/libdirac_common/band_codec.cpp
@@ -433,7 +433,7 @@ inline int BandCodec::ChooseFollowContext( const int bin_number ) const
}
}
-
+ return 0; // avoid warning
}
inline int BandCodec::ChooseInfoContext() const
...@@ -188,7 +188,7 @@ ZLIB_URL=$(SF)/libpng/zlib-$(ZLIB_VERSION).tar.gz ...@@ -188,7 +188,7 @@ ZLIB_URL=$(SF)/libpng/zlib-$(ZLIB_VERSION).tar.gz
XML_VERSION=2.7.2 XML_VERSION=2.7.2
#XML_URL=$(VIDEOLAN)/testing/contrib/libxml2-$(XML_VERSION).tar.gz #XML_URL=$(VIDEOLAN)/testing/contrib/libxml2-$(XML_VERSION).tar.gz
XML_URL=http://xmlsoft.org/sources/libxml2-$(XML_VERSION).tar.gz XML_URL=http://xmlsoft.org/sources/libxml2-$(XML_VERSION).tar.gz
DIRAC_VERSION=1.0.0 DIRAC_VERSION=1.0.2
DIRAC_URL=$(SF)/dirac/dirac-$(DIRAC_VERSION).tar.gz DIRAC_URL=$(SF)/dirac/dirac-$(DIRAC_VERSION).tar.gz
DX_HEADERS_URL=$(VIDEOLAN)/testing/contrib/win32-dx7headers.tgz DX_HEADERS_URL=$(VIDEOLAN)/testing/contrib/win32-dx7headers.tgz
DSHOW_HEADERS_URL=$(VIDEOLAN)/contrib/dshow-headers.tgz DSHOW_HEADERS_URL=$(VIDEOLAN)/contrib/dshow-headers.tgz
......
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