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

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

Author: piers
Date: Sat May 24 21:49:03 2008
New Revision: 4159

Modified:
   vic/branches/mpeg4/codec/ffmpeg_codec.h
   vic/branches/mpeg4/codec/x264encoder.cpp
   vic/branches/mpeg4/render/color-swscale.cpp
   vic/branches/mpeg4/video/deinterlace.cpp
   vic/branches/mpeg4/video/deinterlace.h

Log:
Updated for newer ffmpeg library - adjusted #include's and one function call
pp_postprocess()


Modified: vic/branches/mpeg4/codec/ffmpeg_codec.h
==============================================================================
--- vic/branches/mpeg4/codec/ffmpeg_codec.h	(original)
+++ vic/branches/mpeg4/codec/ffmpeg_codec.h	Sat May 24 21:49:03 2008
@@ -3,7 +3,7 @@
 
 extern "C"
 {
-#include "ffmpeg/avcodec.h"
+#include "libavcodec/avcodec.h"
 //#include "ffmpeg/libavcodec/dsputil.h"
 //#include "ffmpeg/libavcodec/mpegvideo.h"
 }

Modified: vic/branches/mpeg4/codec/x264encoder.cpp
==============================================================================
--- vic/branches/mpeg4/codec/x264encoder.cpp	(original)
+++ vic/branches/mpeg4/codec/x264encoder.cpp	Sat May 24 21:49:03 2008
@@ -5,7 +5,7 @@
 #include "config.h"
 
 #include "x264encoder.h"
-#include "ffmpeg/avcodec.h"
+#include "libavcodec/avcodec.h"
 #include "databuffer.h"
 extern "C"{
 #include "x264.h"

Modified: vic/branches/mpeg4/render/color-swscale.cpp
==============================================================================
--- vic/branches/mpeg4/render/color-swscale.cpp	(original)
+++ vic/branches/mpeg4/render/color-swscale.cpp	Sat May 24 21:49:03 2008
@@ -7,8 +7,8 @@
 
 #include "config_arch.h"
 extern "C" {
-#include "ffmpeg/swscale.h"
-#include "ffmpeg/avutil.h"
+#include "libswscale/swscale.h"
+#include "libavutil/avutil.h"
 }
 #include "cpu/cpudetect.h"
 

Modified: vic/branches/mpeg4/video/deinterlace.cpp
==============================================================================
--- vic/branches/mpeg4/video/deinterlace.cpp	(original)
+++ vic/branches/mpeg4/video/deinterlace.cpp	Sat May 24 21:49:03 2008
@@ -57,7 +57,7 @@
 	src[2] = src[1] + framesize/4;
 
 
-        pp_postprocess(src, srcStride,
+        pp_postprocess((const uint8_t**)src, srcStride,
                    src, srcStride,
                    width, height,
                    NULL,  0,

Modified: vic/branches/mpeg4/video/deinterlace.h
==============================================================================
--- vic/branches/mpeg4/video/deinterlace.h	(original)
+++ vic/branches/mpeg4/video/deinterlace.h	Sat May 24 21:49:03 2008
@@ -7,7 +7,7 @@
 
 #include "cpu/cpudetect.h"
 extern "C" {
-#include <postproc/postprocess.h>
+#include <libpostproc/postprocess.h>
 }
 
 // only used for YUV420