diff options
| author | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2005-08-05 15:29:56 +0000 |
|---|---|---|
| committer | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2005-08-05 15:29:56 +0000 |
| commit | 6984879ed68d6edefb012ff5fd980168a314155c (patch) | |
| tree | 16e2c702c2b871b9cb7d27bf30e025572241644f /ext/libpostproc | |
| parent | 6e4b116b5035463ea0db06ea716b85a298e4b69b (diff) | |
Backport BRANCH-THREADED to HEAD, fix a bit.
Original commit message from CVS:
* configure.ac:
* ext/ffmpeg/Makefile.am:
* ext/ffmpeg/gstffmpeg.c: (plugin_init):
* ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_caps_with_codecid):
* ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_class_init),
(gst_ffmpegdec_init), (gst_ffmpegdec_query), (gst_ffmpegdec_event),
(gst_ffmpegdec_open), (gst_ffmpegdec_setcaps),
(gst_ffmpegdec_get_buffer), (gst_ffmpegdec_negotiate),
(gst_ffmpegdec_frame), (gst_ffmpegdec_sink_event),
(gst_ffmpegdec_chain), (gst_ffmpegdec_change_state),
(gst_ffmpegdec_register):
* ext/ffmpeg/gstffmpegenc.c: (gst_ffmpegenc_class_init),
(gst_ffmpegenc_init), (gst_ffmpegenc_getcaps),
(gst_ffmpegenc_setcaps), (gst_ffmpegenc_chain_video),
(gst_ffmpegenc_chain_audio):
* ext/libpostproc/Makefile.am:
Backport BRANCH-THREADED to HEAD, fix a bit.
Diffstat (limited to 'ext/libpostproc')
| -rw-r--r-- | ext/libpostproc/Makefile.am | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/ext/libpostproc/Makefile.am b/ext/libpostproc/Makefile.am index 98577a2..cbb8c60 100644 --- a/ext/libpostproc/Makefile.am +++ b/ext/libpostproc/Makefile.am @@ -1,17 +1,16 @@ - -plugin_LTLIBRARIES = libgstpostproc.la - -libgstpostproc_la_SOURCES = gstpostproc.c - -libgstpostproc_la_CFLAGS = $(GST_CFLAGS) \ - -I $(top_srcdir)/gst-libs/ext/ffmpeg/libavformat \ - -I $(top_srcdir)/gst-libs/ext/ffmpeg/libavcodec -libgstpostproc_la_LIBADD = \ - $(top_builddir)/gst-libs/ext/ffmpeg/libavformat/libavformat.la \ - $(top_builddir)/gst-libs/ext/ffmpeg/libavcodec/libavcodec.la +#plugin_LTLIBRARIES = libgstpostproc.la +# +#libgstpostproc_la_SOURCES = gstpostproc.c +# +#libgstpostproc_la_CFLAGS = $(GST_CFLAGS) \ +# -I $(top_srcdir)/gst-libs/ext/ffmpeg/libavformat \ +# -I $(top_srcdir)/gst-libs/ext/ffmpeg/libavcodec +#libgstpostproc_la_LIBADD = \ +# $(top_builddir)/gst-libs/ext/ffmpeg/libavformat/libavformat.la \ +# $(top_builddir)/gst-libs/ext/ffmpeg/libavcodec/libavcodec.la # $(top_builddir)/gst-libs/ext/ffmpeg/libavcodec/libpostproc/libffpostproc.la - -libgstpostproc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) - -noinst_HEADERS = \ - gstpostproc.h
\ No newline at end of file +# +#libgstpostproc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) +# +#noinst_HEADERS = \ +# gstpostproc.h |