mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-05 18:22:23 +00:00
Code Issues 1 Projects Releases Wiki Activity

Merge branch 'master' into 0.11

Browse source
This commit is contained in:
Edward Hervey 2011-07-15 12:34:19 +02:00
commit b41422f1f3
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
configure.ac
View file

@ -313,9 +313,10 @@ else
--enable-optimizations"
# if we are cross-compiling, tell ffmpeg so
target_os=`echo $host_os | sed 's/-gnu//'`
if test "x$cross_compiling" = xyes; then
embffmpeg_configure_args="$embffmpeg_configure_args --enable-cross-compile \
--target-os=$host_os --arch=$host_cpu --cross-prefix=$host_alias-"
--target-os=$target_os --arch=$host_cpu --cross-prefix=$host_alias-"
fi
case $host_os in

2
ext/ffmpeg/gstffmpegdec.c
View file

@ -193,7 +193,7 @@ gst_ts_info_get (GstFFMpegDec * dec, gint idx)
#define DEFAULT_DO_PADDING TRUE
#define DEFAULT_DEBUG_MV FALSE
#define DEFAULT_CROP TRUE
#define DEFAULT_MAX_THREADS 0
#define DEFAULT_MAX_THREADS 1
enum
{

2
gst-libs/ext/libav

@ -1 +1 @@
Subproject commit 9c709f053474dd74890f32662b7d7010e5cc0b0d
Subproject commit 9459390f29ec6df63ff1878f13b7b4343811948a