diff options
| author | Peter Schlaile <peter@schlaile.de> | 2009-03-22 22:19:21 +0300 |
|---|---|---|
| committer | Peter Schlaile <peter@schlaile.de> | 2009-03-22 22:19:21 +0300 |
| commit | 615c5232c7b2e51f9722fdff58e04ae53c043797 (patch) | |
| tree | ee259a124d9c94e5363db7914cb1798931794875 /config | |
| parent | d5d2d1feceb9f261ff04682ca4f6a2658c04ab5c (diff) | |
== FFMPEG ==
Updated ffmpeg to release version 0.5
updated x264 to today's daily build
thanks to ben2610 for first patches (but you got hddaudio.c wrong :)
Diffstat (limited to 'config')
| -rw-r--r-- | config/darwin-config.py | 6 | ||||
| -rw-r--r-- | config/linux2-config.py | 7 |
2 files changed, 2 insertions, 11 deletions
diff --git a/config/darwin-config.py b/config/darwin-config.py index cfd6a9395bb..39c9b9df4ff 100644 --- a/config/darwin-config.py +++ b/config/darwin-config.py @@ -40,11 +40,7 @@ else: # enable ffmpeg support WITH_BF_FFMPEG = True # -DWITH_FFMPEG BF_FFMPEG = "#extern/ffmpeg" -# trick : The version of ffmpeg in extern/ffmpeg uses explicit libav.. directory in #include statements -# To keep Blender compatible with older versions, I add ${BF_FFMPEG} to the inc dir so that ffmpeg -# finds the files directly in extern/ffmpeg/libav... while blender finds them in -# extern/ffmpeg/include. -BF_FFMPEG_INC = '${BF_FFMPEG}/include ${BF_FFMPEG}' +BF_FFMPEG_INC = '${BF_FFMPEG}' if USE_SDK==True: BF_FFMPEG_EXTRA = '-isysroot '+MACOSX_SDK+' -mmacosx-version-min='+MAC_MIN_VERS #BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib' diff --git a/config/linux2-config.py b/config/linux2-config.py index 6ba3052048d..102bb2e5e4c 100644 --- a/config/linux2-config.py +++ b/config/linux2-config.py @@ -140,12 +140,7 @@ BF_FFMPEG_LIB = '' # Uncomment the following two lines to use system's ffmpeg # BF_FFMPEG = '/usr' # BF_FFMPEG_LIB = 'avformat avcodec swscale avutil avdevice' -# trick : The version of ffmpeg in extern/ffmpeg uses explicit libav.. directory in #include statements -# To keep Blender compatible with older version, I add ${BF_FFMPEG} to the inc dir so that ffmpeg -# finds the files directly in extern/ffmpeg/libav... while blender finds them in -# extern/ffmpeg/include. When using system ffmpeg, you don't need that, assuming the system library -# still use the flat directory model, otherwise will not compile anyway -BF_FFMPEG_INC = '${BF_FFMPEG}/include ${BF_FFMPEG}' +BF_FFMPEG_INC = '${BF_FFMPEG}' BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib' # enable ogg, vorbis and theora in ffmpeg |