diff options
| author | Wim Taymans <wim.taymans@collabora.co.uk> | 2012-02-21 18:02:56 +0100 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@collabora.co.uk> | 2012-02-21 18:02:56 +0100 |
| commit | 05a44b7ac62f01510296a960896f01dbeec3ef76 (patch) | |
| tree | 8dc882d9f0944284576ab571d0dc18b139b3b772 | |
| parent | a079886388399ae4eb6a15b7641b4b0a6ad7dcff (diff) | |
ffdec: disable multithreading
It causes refcounting problems.
| -rw-r--r-- | ext/ffmpeg/gstffmpegdec.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ext/ffmpeg/gstffmpegdec.c b/ext/ffmpeg/gstffmpegdec.c index 3dba1e3..9b2044c 100644 --- a/ext/ffmpeg/gstffmpegdec.c +++ b/ext/ffmpeg/gstffmpegdec.c @@ -210,7 +210,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 { @@ -1426,8 +1426,8 @@ gst_ffmpegdec_audio_negotiate (GstFFMpegDec * ffmpegdec, gboolean force) memcpy (ffmpegdec->format.audio.gst_layout, ffmpegdec->format.audio.ffmpeg_layout, sizeof (GstAudioChannelPosition) * ffmpegdec->format.audio.channels); - gst_audio_channel_positions_to_valid_order (ffmpegdec->format. - audio.gst_layout, ffmpegdec->format.audio.channels); + gst_audio_channel_positions_to_valid_order (ffmpegdec->format.audio. + gst_layout, ffmpegdec->format.audio.channels); GST_LOG_OBJECT (ffmpegdec, "output caps %" GST_PTR_FORMAT, caps); @@ -1939,7 +1939,7 @@ gst_ffmpegdec_video_frame (GstFFMpegDec * ffmpegdec, GstStructure *s = gst_caps_get_structure (GST_BUFFER_CAPS (buffer), 0); gboolean interlaced; gboolean found = gst_structure_get_boolean (s, "interlaced", &interlaced); - if (!found || (!!interlaced != !!ffmpegdec->format.video.interlaced)) { + if (!found || (! !interlaced != ! !ffmpegdec->format.video.interlaced)) { GST_DEBUG_OBJECT (ffmpegdec, "Buffer interlacing does not match pad, updating"); buffer = gst_buffer_make_metadata_writable (buffer); |