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

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

Author: piers
Date: Mon Apr 16 01:08:59 2007
New Revision: 3987

Modified:
   vic/branches/mpeg4/Makefile.in
   vic/branches/mpeg4/codec/rtp_h264_depayloader.h
   vic/branches/mpeg4/configure
   vic/branches/mpeg4/configure.in

Log:
Updates to make H.264 build on OSX
- Modified svn checkout of x264(r650), ffmpeg(r7110) to get particular versions
- Tweaked #includes on rtp_h264_depayloader.h
- Added addition include search paths and altered the ordering 


Modified: vic/branches/mpeg4/Makefile.in
==============================================================================
--- vic/branches/mpeg4/Makefile.in	(original)
+++ vic/branches/mpeg4/Makefile.in	Mon Apr 16 01:08:59 2007
@@ -58,7 +58,7 @@
 INCLUDE_TK = @V_INCLUDE_TK@
 INCLUDE_TCL = @V_INCLUDE_TCL@
 INCLUDE_X11 = @V_INCLUDE_X11@
-INCLUDE_MISC = @V_INCLUDE@ -I. -Icodec/tmndec -Icodec/tmn-x -Icodec/h263 -Irtp -Irender -Inet -Ivideo -Icodec -I../common/src
+INCLUDE_MISC = -I. -Icodec/tmndec -Icodec/tmn-x -Icodec/h263 -Irtp -Irender -Inet -Ivideo -Icodec -I../common/src @V_INCLUDE@ 
 
 STATIC = @V_STATIC@
 MKDEP = ./mkdep

Modified: vic/branches/mpeg4/codec/rtp_h264_depayloader.h
==============================================================================
--- vic/branches/mpeg4/codec/rtp_h264_depayloader.h	(original)
+++ vic/branches/mpeg4/codec/rtp_h264_depayloader.h	Mon Apr 16 01:08:59 2007
@@ -24,8 +24,8 @@
 
 extern "C"
 {
-#include "ffmpeg/avcodec.h"
-#include "ffmpeg/avformat.h"
+#include "avcodec.h"
+#include "avformat.h"
 #include "base64.h"
 #include "packetbuffer.h"
 //#include "rtp_internal.h"

Modified: vic/branches/mpeg4/configure
==============================================================================
--- vic/branches/mpeg4/configure	(original)
+++ vic/branches/mpeg4/configure	Mon Apr 16 01:08:59 2007
@@ -4578,11 +4578,11 @@
 if test "$ffmpegco" = "yes" ; then
    if test ! -r "ffmpeg" ; then
      echo "checking out ffmpeg from  svn://svn.mplayerhq.hu/ffmpeg/trunk..."
-     svn checkout svn://svn.mplayerhq.hu/ffmpeg/trunk ffmpeg
+     svn checkout -r 7110 svn://svn.mplayerhq.hu/ffmpeg/trunk ffmpeg
      echo "Configuring ffmpeg..."
      cd ffmpeg; ./configure --prefix=$V_PATH/ffmpeg --enable-gpl --enable-swscaler --enable-pp; cd ..
    fi
-   V_INCLUDE="$V_INCLUDE -Iffmpeg/include"
+   V_INCLUDE="$V_INCLUDE -Iffmpeg/avformat -Iffmpeg/include/ffmpeg -Iffmpeg/include"
    V_CODEC_LIB="$V_CODEC_LIB ffmpeg/lib/libavcodec.a ffmpeg/lib/libavutil.a ffmpeg/lib/libswscale.a ffmpeg/lib/libpostproc.a"
 fi
 
@@ -4596,7 +4596,7 @@
 if test "$x264co" = "yes" ; then
    if test ! -r "x264" ; then
      echo "checking out x264 from  svn co svn://svn.videolan.org/x264/trunk..."
-     svn checkout svn://svn.videolan.org/x264/trunk x264
+     svn checkout -r 600 svn://svn.videolan.org/x264/trunk x264
      echo "Configuring x264..."
      cd x264; ./configure --prefix=$V_PATH/x264; cd ..
    fi

Modified: vic/branches/mpeg4/configure.in
==============================================================================
--- vic/branches/mpeg4/configure.in	(original)
+++ vic/branches/mpeg4/configure.in	Mon Apr 16 01:08:59 2007
@@ -67,20 +67,20 @@
 AC_ARG_ENABLE(ffmpeg-co,	--disable-ffmpeg-co	Enable or disable ffmpeg svn checkout, ffmpegco="no", ffmpegco="yes")
 if test "$ffmpegco" = "yes" ; then
    if test ! -r "ffmpeg" ; then
-     echo "checking out ffmpeg from  svn://svn.mplayerhq.hu/ffmpeg/trunk..."
-     svn checkout svn://svn.mplayerhq.hu/ffmpeg/trunk ffmpeg
+     echo "checking out r7110 of ffmpeg from  svn://svn.mplayerhq.hu/ffmpeg/trunk..."
+     svn checkout -r 7110 svn://svn.mplayerhq.hu/ffmpeg/trunk ffmpeg
      echo "Configuring ffmpeg..."
      cd ffmpeg; ./configure --prefix=$V_PATH/ffmpeg --enable-gpl --enable-swscaler --enable-pp; cd ..
    fi
-   V_INCLUDE="$V_INCLUDE -Iffmpeg/include"
+   V_INCLUDE="$V_INCLUDE -Iffmpeg/avformat -Iffmpeg/include/ffmpeg -Iffmpeg/include"
    V_CODEC_LIB="$V_CODEC_LIB ffmpeg/lib/libavcodec.a ffmpeg/lib/libavutil.a ffmpeg/lib/libswscale.a ffmpeg/lib/libpostproc.a"
 fi
 
 AC_ARG_ENABLE(x264-co,        --disable-x264-co      Enable or disable x264 svn checkout, x264co="no", x264co="yes")
 if test "$x264co" = "yes" ; then
    if test ! -r "x264" ; then
-     echo "checking out x264 from  svn co svn://svn.videolan.org/x264/trunk..."
-     svn checkout svn://svn.videolan.org/x264/trunk x264
+     echo "checking out r650 of x264 from  svn co svn://svn.videolan.org/x264/trunk..."
+     svn checkout -r 650 svn://svn.videolan.org/x264/trunk x264
      echo "Configuring x264..."
      cd x264; ./configure --prefix=$V_PATH/x264; cd ..
    fi