[Sumover-dev] [svn commit] r4399 - in vic/branches/mpeg4: render

[sumover-dev at cs.ucl.ac.uk]

Author: piers
Date: Thu Mar 12 10:29:41 2009
New Revision: 4399

Modified:
   vic/branches/mpeg4/Makefile.in
   vic/branches/mpeg4/configure
   vic/branches/mpeg4/configure.in
   vic/branches/mpeg4/render/color-swscale.cpp

Log:
Updates for latest ffmpeg library - also removed comments from ffmpeg svn checkout in configure that got inadvertently committed before. 


Modified: vic/branches/mpeg4/Makefile.in
==============================================================================
--- vic/branches/mpeg4/Makefile.in	(original)
+++ vic/branches/mpeg4/Makefile.in	Thu Mar 12 10:29:41 2009
@@ -429,6 +429,11 @@
 	    "chmod 444 $$name.tar.gz" ; \
 	     chmod 444 $$name.tar.gz
 
+ffmpeg/libavutil/libavutil.a: ffmpeg/lib/libavcodec.a
+ffmpeg/libavutil/libavutil.a: ffmpeg/lib/libavutil.a
+ffmpeg/libswscale/libswscale.a: ffmpeg/lib/libswscale.a
+ffmpeg/libpostproc/libpostproc.a: ffmpeg/lib/libpostproc.a
+
 ffmpeg/lib/libavcodec.a:
 	(cd ffmpeg/libavcodec; make; make install )
 

Modified: vic/branches/mpeg4/configure
==============================================================================
--- vic/branches/mpeg4/configure	(original)
+++ vic/branches/mpeg4/configure	Thu Mar 12 10:29:41 2009
@@ -4954,11 +4954,11 @@
    #if test ! -r "ffmpeg" ; then
      echo "checking out HEAD of ffmpeg from  svn://svn.mplayerhq.hu/ffmpeg/trunk..."
      #echo "checking out r7110 (and 21687 of libswscale) of ffmpeg from  svn://svn.mplayerhq.hu/ffmpeg/trunk..."
-     #svn checkout svn://svn.mplayerhq.hu/ffmpeg/trunk ffmpeg
+     svn checkout svn://svn.mplayerhq.hu/ffmpeg/trunk ffmpeg
      #svn checkout -r 7110 svn://svn.mplayerhq.hu/ffmpeg/trunk ffmpeg
      #svn checkout -r 21687 svn://svn.mplayerhq.hu/mplayer/trunk/libswscale  ffmpeg/libswscale
      echo "Configuring ffmpeg..."
-     cd ffmpeg; ./configure --prefix=$V_PATH/ffmpeg $ppc_conf --enable-gpl --enable-swscale --enable-postproc; cd ..
+     cd ffmpeg; ./configure --prefix=$V_PATH/ffmpeg $ppc_conf --enable-gpl --enable-postproc; cd ..
    #fi
    V_INCLUDE="$V_INCLUDE -Iffmpeg/include -Iffmpeg"
    V_CODEC_LIB="$V_CODEC_LIB ffmpeg/libavcodec/libavcodec.a ffmpeg/libavutil/libavutil.a ffmpeg/libswscale/libswscale.a ffmpeg/libpostproc/libpostproc.a"

Modified: vic/branches/mpeg4/configure.in
==============================================================================
--- vic/branches/mpeg4/configure.in	(original)
+++ vic/branches/mpeg4/configure.in	Thu Mar 12 10:29:41 2009
@@ -89,7 +89,7 @@
      #svn checkout -r 7110 svn://svn.mplayerhq.hu/ffmpeg/trunk ffmpeg
      #svn checkout -r 21687 svn://svn.mplayerhq.hu/mplayer/trunk/libswscale  ffmpeg/libswscale
      echo "Configuring ffmpeg..."
-     cd ffmpeg; ./configure --prefix=$V_PATH/ffmpeg $ppc_conf --enable-gpl --enable-swscale --enable-postproc; cd ..
+     cd ffmpeg; ./configure --prefix=$V_PATH/ffmpeg $ppc_conf --enable-gpl --enable-postproc; cd ..
    #fi
    V_INCLUDE="$V_INCLUDE -Iffmpeg/include -Iffmpeg"
    V_CODEC_LIB="$V_CODEC_LIB ffmpeg/libavcodec/libavcodec.a ffmpeg/libavutil/libavutil.a ffmpeg/libswscale/libswscale.a ffmpeg/libpostproc/libpostproc.a"

Modified: vic/branches/mpeg4/render/color-swscale.cpp
==============================================================================
--- vic/branches/mpeg4/render/color-swscale.cpp	(original)
+++ vic/branches/mpeg4/render/color-swscale.cpp	Thu Mar 12 10:29:41 2009
@@ -95,7 +95,7 @@
 	      if(!outw_ || !outh_ || !width_ || !height_)
 		return;
 
-	      int in_format = PIX_FMT_YUV420P;
+	      PixelFormat in_format = PIX_FMT_YUV420P;
 	      if (decimation_ == 422) {
 		in_format = PIX_FMT_YUV422P;
 	      }
@@ -147,7 +147,7 @@
 	uint8_t *sws_tar[3];
 	int sws_src_stride[3];
 	int sws_tar_stride[3];
-	int out_format;
+	PixelFormat out_format;
 	int bytes_per_pixel;
 };