Changeset e58633393c744fcc1b0809c23a69dac68195183c

Timestamp:

20/06/08 22:48:50 (4 months ago)

Author:

Pavlov Konstantin <thresh@videolan.org>

git-committer:

Pavlov Konstantin <thresh@videolan.org> 1213994930 +0400

git-parent:

[4c270ec59c7e10e41c224a44f874d306cb81e5e6]

git-author:

Pavlov Konstantin <thresh@videolan.org> 1213993244 +0400

Message:

Update dirac support to 0.10.0.
Require it in configure as well.

Files:

• configure.ac (modified) (1 diff)
• extras/contrib/src/Makefile (modified) (1 diff)
• extras/contrib/src/Patches/dirac-cross.patch (modified) (9 diffs)
• extras/contrib/src/packages.mak (modified) (1 diff)
• modules/codec/dirac.c (modified) (2 diffs)

configure.ac

@@ -3572 +3572 @@
-[  --enable-dirac          experimental dirac codec (default disabled)])
-if test "${enable_dirac}" = "yes"; then
-9
+10
-      VLC_ADD_PLUGIN([dirac])
-      VLC_ADD_CFLAGS([dirac],[$DIRAC_CFLAGS])
-      VLC_ADD_LIBS([dirac],[$DIRAC_LIBS -lstdc++]) ],[
-doesn't appear to be installed on you
+>= 0.10.0 doesn't appear to be installed on your
-  ])
-fi

extras/contrib/src/Makefile

@@ -2185 +2185 @@
-dirac: dirac-$(DIRAC_VERSION).tar.gz
-    $(EXTRACT_GZ)
-0
+1 -d dirac
-ifdef HAVE_CYGWIN
-    # incorrect compile warning with cygwin compiler 3.4.4
-    patch -p0 <Patches/dirac-cygwin.patch
-endif
-
+-I m4 
-
-DIRAC_SUBDIRS = libdirac_byteio libdirac_common libdirac_motionest libdirac_encoder libdirac_decoder

extras/contrib/src/Patches/dirac-cross.patch

@@ -1 @@
-ruN dirac-0.6.0.old/Makefile.am dirac-0.6.0
-
-
-
-
+-git a/Makefile.am b
+
+
+
+
- 
-
-
-
+
+
+
+
- 
- .PHONY: valgrind-check
@@ -21 +22 @@
- if HAVE_LATEX
- DOC_DIR = doc
-
-
-
-
+
+
+
+
+
- dnl algorithm documentation is not distributed in
- dnl the release. It is available only from CVS
@@ -33 +35 @@
- 
- dnl -----------------------------------------------
-1,7 +151,7 @@
+7,7 +157,7 @@ dnl Checks for optional files in doc directory.
- dnl Enhancements is not distributed in
- dnl the release. It is available only from CVS
@@ -42 +44 @@
- 
- dnl -----------------------------------------------
-59,7 +159,7 @@
+65,7 +165,7 @@ dnl Checks for optional files in doc directory.
- dnl Global Motion documentation is not distributed in
- dnl the release. It is available only from CVS
@@ -51 +53 @@
- 
- dnl -----------------------------------------------
-67,7 +167,7 @@
+73,7 +173,7 @@ dnl Checks for optional files in doc directory.
- dnl Upconversion doc is not distributed in
- dnl the release. It is available only from CVS
@@ -60 +62 @@
- 
- dnl -----------------------------------------------
-75,7 +175,7 @@
+81,7 +181,7 @@ dnl Checks for optional files in doc directory.
- dnl programmer's guide is not distributed in
- dnl the release. It is available only from CVS
@@ -69 +71 @@
- 
- dnl -----------------------------------------------
-3,7 +183,7 @@
+9,7 +189,7 @@ dnl Checks for optional files in doc directory.
- dnl Diagnostics tools docs are is not distributed in
- dnl the release. It is available only from CVS
@@ -78 +80 @@
- 
- dnl -----------------------------------------------
-
-
-
+
+
+
+
+
-         }
- 
@@ -88 +92 @@
- }
- 
- 7
+

extras/contrib/src/packages.mak

@@ -195 +195 @@
-XML_URL=$(VIDEOLAN)/testing/contrib/libxml2-$(XML_VERSION).tar.gz
-#XML_URL=http://xmlsoft.org/sources/libxml2-$(XML_VERSION).tar.gz
-9.1
+10.0
-DIRAC_URL=$(SF)/dirac/dirac-$(DIRAC_VERSION).tar.gz
-DX_HEADERS_URL=$(VIDEOLAN)/testing/contrib/win32-dx7headers.tgz

modules/codec/dirac.c

@@ -276 +276 @@
-            break;
-
-        case STATE_PICTURE_START:
-            msg_Dbg( p_dec, "PICTURE_START: frame_type=%i frame_num=%d",
-                     p_sys->p_dirac->frame_params.ftype,
-                     p_sys->p_dirac->frame_params.fnum );
-            break;
-
-        case STATE_PICTURE_AVAIL:
-
-
-
+
+
-
-            /* Picture available for display */
@@ -477 +470 @@
-    encoder_sys_t *p_sys = p_enc->p_sys;
-
-i
+lld
-             p_sys->p_dirac->enc_seqstats.bit_rate );
-