summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWim Taymans <wim.taymans@collabora.co.uk>2011-02-28 10:37:34 +0100
committerWim Taymans <wim.taymans@collabora.co.uk>2011-02-28 12:13:17 +0100
commit88271530e424cc9c3558ab0ff5f5f62c7f1ce2ad (patch)
treee442511bb7fe909f45b8835371ab50a2302dd87c
parent7a225ab60498fd62b871db1aa89322a92fdce68e (diff)
ffmpeg: disable resample0.11-fdo
-rw-r--r--ext/ffmpeg/Makefile.am5
-rw-r--r--ext/ffmpeg/gstffmpeg.c2
2 files changed, 4 insertions, 3 deletions
diff --git a/ext/ffmpeg/Makefile.am b/ext/ffmpeg/Makefile.am
index 3c02817..bd9e6b4 100644
--- a/ext/ffmpeg/Makefile.am
+++ b/ext/ffmpeg/Makefile.am
@@ -15,8 +15,9 @@ libgstffmpeg_la_SOURCES = gstffmpeg.c \
gstffmpegcfg.c \
gstffmpegdemux.c \
gstffmpegmux.c \
- gstffmpegdeinterlace.c \
- gstffmpegaudioresample.c
+ gstffmpegdeinterlace.c
+#\
+# gstffmpegaudioresample.c
# \
# gstffmpegscale.c
diff --git a/ext/ffmpeg/gstffmpeg.c b/ext/ffmpeg/gstffmpeg.c
index 245ff60..a69bf49 100644
--- a/ext/ffmpeg/gstffmpeg.c
+++ b/ext/ffmpeg/gstffmpeg.c
@@ -148,8 +148,8 @@ plugin_init (GstPlugin * plugin)
#endif
#if 0
gst_ffmpegcsp_register (plugin);
-#endif
gst_ffmpegaudioresample_register (plugin);
+#endif
register_protocol (&gstreamer_protocol);
register_protocol (&gstpipe_protocol);