From 2e9cb811202a74b95b03d39038f861cbb3bed1a1 Mon Sep 17 00:00:00 2001 From: Edward Hervey Date: Mon, 17 Oct 2011 16:02:51 +0200 Subject: [PATCH 1/4] libav: Switch to current git master --- gst-libs/ext/libav | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gst-libs/ext/libav b/gst-libs/ext/libav index 20ca827019..85afbb1d00 160000 --- a/gst-libs/ext/libav +++ b/gst-libs/ext/libav @@ -1 +1 @@ -Subproject commit 20ca827019a72bfacb38e73d0b8590e651818272 +Subproject commit 85afbb1d00d58812df5d634e946b2fcf653bcd8e From 56854de8738f554603e2ef49bfd7e45f27e947a1 Mon Sep 17 00:00:00 2001 From: Edward Hervey Date: Mon, 17 Oct 2011 16:26:20 +0200 Subject: [PATCH 2/4] configure.ac: Fix for new libav --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 9b2684c991..f0ad6146c6 100644 --- a/configure.ac +++ b/configure.ac @@ -305,8 +305,8 @@ else embffmpeg_configure_args="--prefix=$prefix" # Enable pic and static so that we get .a files, but with PIC code. - embffmpeg_configure_args="$embffmpeg_configure_args --disable-ffserver --disable-ffplay\ - --disable-ffmpeg --disable-ffprobe --enable-postproc --enable-gpl --enable-static --enable-pic \ + embffmpeg_configure_args="$embffmpeg_configure_args --disable-avserver --disable-avplay\ + --disable-ffmpeg --disable-avprobe --enable-postproc --enable-gpl --enable-static --enable-pic \ --disable-encoder=flac --disable-decoder=cavs --disable-protocols --disable-devices\ --disable-network --disable-hwaccels --disable-filters --disable-doc\ --enable-optimizations" From fc0a8893d8cbf9a3023486af3d29ad4aae729eb8 Mon Sep 17 00:00:00 2001 From: Edward Hervey Date: Mon, 17 Oct 2011 16:26:52 +0200 Subject: [PATCH 3/4] gstffmpegutils: Fix include --- ext/ffmpeg/gstffmpegutils.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ext/ffmpeg/gstffmpegutils.h b/ext/ffmpeg/gstffmpegutils.h index 4b713dedf3..dbc3faef8e 100644 --- a/ext/ffmpeg/gstffmpegutils.h +++ b/ext/ffmpeg/gstffmpegutils.h @@ -20,11 +20,17 @@ #ifndef __GST_FFMPEG_UTILS_H__ #define __GST_FFMPEG_UTILS_H__ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #ifdef HAVE_FFMPEG_UNINSTALLED +#include #include #else #include #endif + #include /* From 99e61c5f3b8cec62091bb76cb074aa883f92a74c Mon Sep 17 00:00:00 2001 From: Edward Hervey Date: Mon, 17 Oct 2011 16:27:36 +0200 Subject: [PATCH 4/4] gstffmpegdec: Re-enable MT-decoding by default --- ext/ffmpeg/gstffmpegdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/ffmpeg/gstffmpegdec.c b/ext/ffmpeg/gstffmpegdec.c index cc078890ff..035307eb38 100644 --- a/ext/ffmpeg/gstffmpegdec.c +++ b/ext/ffmpeg/gstffmpegdec.c @@ -197,7 +197,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 1 +#define DEFAULT_MAX_THREADS 0 enum {