Changeset 3987

Timestamp:

04/16/07 01:08:59 (6 years ago)

Author:

piers

Message:

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

Location:

vic/branches/mpeg4

Files:

• Makefile.in (modified) (1 diff)
• codec/rtp_h264_depayloader.h (modified) (1 diff)
• configure (modified) (2 diffs)
• configure.in (modified) (2 diffs)

vic/branches/mpeg4/Makefile.in

@@ -59 +59 @@
 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@

vic/branches/mpeg4/codec/rtp_h264_depayloader.h

@@ -25 +25 @@
 extern "C"
 {
-#include "ffmpeg/avcodec.h"
-#include "ffmpeg/avformat.h"
+#include "avcodec.h"
+#include "avformat.h"
 #include "base64.h"
 #include "packetbuffer.h"

vic/branches/mpeg4/configure

@@ -4579 +4579 @@
    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
@@ -4597 +4597 @@
    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 ..

vic/branches/mpeg4/configure.in

@@ -68 +68 @@
 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
@@ -80 +80 @@
 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 ..