Changeset 3987

Show
Ignore:
Timestamp:
04/16/07 01:08:59 (7 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:
4 modified

Legend:

Unmodified
Added
Removed
  • vic/branches/mpeg4/Makefile.in

    r3974 r3987  
    5959INCLUDE_TCL = @V_INCLUDE_TCL@ 
    6060INCLUDE_X11 = @V_INCLUDE_X11@ 
    61 INCLUDE_MISC = @V_INCLUDE@ -I. -Icodec/tmndec -Icodec/tmn-x -Icodec/h263 -Irtp -Irender -Inet -Ivideo -Icodec -I../common/src 
     61INCLUDE_MISC = -I. -Icodec/tmndec -Icodec/tmn-x -Icodec/h263 -Irtp -Irender -Inet -Ivideo -Icodec -I../common/src @V_INCLUDE@  
    6262 
    6363STATIC = @V_STATIC@ 
  • vic/branches/mpeg4/codec/rtp_h264_depayloader.h

    r3974 r3987  
    2525extern "C" 
    2626{ 
    27 #include "ffmpeg/avcodec.h" 
    28 #include "ffmpeg/avformat.h" 
     27#include "avcodec.h" 
     28#include "avformat.h" 
    2929#include "base64.h" 
    3030#include "packetbuffer.h" 
  • vic/branches/mpeg4/configure

    r3961 r3987  
    45794579   if test ! -r "ffmpeg" ; then 
    45804580     echo "checking out ffmpeg from  svn://svn.mplayerhq.hu/ffmpeg/trunk..." 
    4581      svn checkout svn://svn.mplayerhq.hu/ffmpeg/trunk ffmpeg 
     4581     svn checkout -r 7110 svn://svn.mplayerhq.hu/ffmpeg/trunk ffmpeg 
    45824582     echo "Configuring ffmpeg..." 
    45834583     cd ffmpeg; ./configure --prefix=$V_PATH/ffmpeg --enable-gpl --enable-swscaler --enable-pp; cd .. 
    45844584   fi 
    4585    V_INCLUDE="$V_INCLUDE -Iffmpeg/include" 
     4585   V_INCLUDE="$V_INCLUDE -Iffmpeg/avformat -Iffmpeg/include/ffmpeg -Iffmpeg/include" 
    45864586   V_CODEC_LIB="$V_CODEC_LIB ffmpeg/lib/libavcodec.a ffmpeg/lib/libavutil.a ffmpeg/lib/libswscale.a ffmpeg/lib/libpostproc.a" 
    45874587fi 
     
    45974597   if test ! -r "x264" ; then 
    45984598     echo "checking out x264 from  svn co svn://svn.videolan.org/x264/trunk..." 
    4599      svn checkout svn://svn.videolan.org/x264/trunk x264 
     4599     svn checkout -r 600 svn://svn.videolan.org/x264/trunk x264 
    46004600     echo "Configuring x264..." 
    46014601     cd x264; ./configure --prefix=$V_PATH/x264; cd .. 
  • vic/branches/mpeg4/configure.in

    r3954 r3987  
    6868if test "$ffmpegco" = "yes" ; then 
    6969   if test ! -r "ffmpeg" ; then 
    70      echo "checking out ffmpeg from  svn://svn.mplayerhq.hu/ffmpeg/trunk..." 
    71      svn checkout svn://svn.mplayerhq.hu/ffmpeg/trunk ffmpeg 
     70     echo "checking out r7110 of ffmpeg from  svn://svn.mplayerhq.hu/ffmpeg/trunk..." 
     71     svn checkout -r 7110 svn://svn.mplayerhq.hu/ffmpeg/trunk ffmpeg 
    7272     echo "Configuring ffmpeg..." 
    7373     cd ffmpeg; ./configure --prefix=$V_PATH/ffmpeg --enable-gpl --enable-swscaler --enable-pp; cd .. 
    7474   fi 
    75    V_INCLUDE="$V_INCLUDE -Iffmpeg/include" 
     75   V_INCLUDE="$V_INCLUDE -Iffmpeg/avformat -Iffmpeg/include/ffmpeg -Iffmpeg/include" 
    7676   V_CODEC_LIB="$V_CODEC_LIB ffmpeg/lib/libavcodec.a ffmpeg/lib/libavutil.a ffmpeg/lib/libswscale.a ffmpeg/lib/libpostproc.a" 
    7777fi 
     
    8080if test "$x264co" = "yes" ; then 
    8181   if test ! -r "x264" ; then 
    82      echo "checking out x264 from  svn co svn://svn.videolan.org/x264/trunk..." 
    83      svn checkout svn://svn.videolan.org/x264/trunk x264 
     82     echo "checking out r650 of x264 from  svn co svn://svn.videolan.org/x264/trunk..." 
     83     svn checkout -r 650 svn://svn.videolan.org/x264/trunk x264 
    8484     echo "Configuring x264..." 
    8585     cd x264; ./configure --prefix=$V_PATH/x264; cd ..