mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-19 05:45:58 +00:00
Code Issues 1 Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into 0.11

Browse source
This commit is contained in:
Edward Hervey 2011-10-17 16:29:10 +02:00
commit 5264fd3c97
4 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
configure.ac
View file

@ -306,8 +306,8 @@ else
embffmpeg_configure_args="--prefix=$prefix" embffmpeg_configure_args="--prefix=$prefix"
# Enable pic and static so that we get .a files, but with PIC code. # Enable pic and static so that we get .a files, but with PIC code.
embffmpeg_configure_args="$embffmpeg_configure_args --disable-ffserver --disable-ffplay\ embffmpeg_configure_args="$embffmpeg_configure_args --disable-avserver --disable-avplay\
--disable-ffmpeg --disable-ffprobe --enable-postproc --enable-gpl --enable-static --enable-pic \ --disable-ffmpeg --disable-avprobe --enable-postproc --enable-gpl --enable-static --enable-pic \
--disable-encoder=flac --disable-decoder=cavs --disable-protocols --disable-devices\ --disable-encoder=flac --disable-decoder=cavs --disable-protocols --disable-devices\
--disable-network --disable-hwaccels --disable-filters --disable-doc\ --disable-network --disable-hwaccels --disable-filters --disable-doc\
--enable-optimizations" --enable-optimizations"

2
ext/ffmpeg/gstffmpegdec.c
View file

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

6
ext/ffmpeg/gstffmpegutils.h
View file

@ -20,11 +20,17 @@
#ifndef __GST_FFMPEG_UTILS_H__ #ifndef __GST_FFMPEG_UTILS_H__
#define __GST_FFMPEG_UTILS_H__ #define __GST_FFMPEG_UTILS_H__
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#ifdef HAVE_FFMPEG_UNINSTALLED #ifdef HAVE_FFMPEG_UNINSTALLED
#include <mathematics.h>
#include <avcodec.h> #include <avcodec.h>
#else #else
#include <libavcodec/avcodec.h> #include <libavcodec/avcodec.h>
#endif #endif
#include <gst/gst.h> #include <gst/gst.h>
/* /*

2
gst-libs/ext/libav

@ -1 +1 @@
Subproject commit 20ca827019a72bfacb38e73d0b8590e651818272 Subproject commit 85afbb1d00d58812df5d634e946b2fcf653bcd8e