Commit graph

34 commits

Author SHA1 Message Date
Sebastian Dröge
44a1dc0138 ffmpeg: Fix merge mistakes 2012-01-10 11:39:27 +01:00
Sebastian Dröge
bde3117e72 Merge branch 'master' into 0.11
Conflicts:
	configure.ac
	ext/ffmpeg/gstffmpegcodecmap.c
	ext/ffmpeg/gstffmpegdec.c
	ext/ffmpeg/gstffmpegdeinterlace.c
	ext/ffmpeg/gstffmpegmux.c
	ext/libswscale/gstffmpegscale.c
2012-01-10 11:35:55 +01:00
Wim Taymans
93be243b3a update for videofilter changes 2011-12-21 23:52:00 +01:00
Vincent Penquerc'h
dcd387b313 ffmpeg: fix pad template ref leaks
https://bugzilla.gnome.org/show_bug.cgi?id=662664
2011-11-28 13:23:42 +00:00
Wim Taymans
afaeebc1b1 ffmpeg: fix some caps 2011-06-20 10:42:30 +02:00
Wim Taymans
c71a2ec502 Merge branch 'master' into 0.11
Conflicts:
	configure.ac
	ext/ffmpeg/gstffmpegdec.c
2011-04-29 18:40:36 +02:00
Edward Hervey
775a3a0640 postproc: pp_*_t => pp_* 2011-04-21 20:56:45 +02:00
Wim Taymans
198fa2571b Merge branch 'master' into 0.11 2011-04-19 19:03:06 +02:00
Marc Plano-Lesay
9c42b7cae9 Fix unused-but-set-variable warnings with gcc 4.6 2011-04-19 16:21:20 +01:00
Wim Taymans
8095b31f9c ffmpeg: port to new memory API 2011-04-04 13:18:13 +02:00
Stefan Kost
07ce1d1906 various: add missing G_PARAM_STATIC_STRINGS flags 2010-10-19 17:26:08 +03:00
Edward Hervey
00e177458c ext: Fix CFLAGS order
We'd pick up system-wide ffmpeg headers otherwise
2010-07-05 15:48:41 +02:00
Thijs Vermeir
330d78f4ff Fix build if ORC is not installed 2010-06-15 09:40:18 +02:00
Sebastian Dröge
3d91d93f32 ffmpeg: Call orc_init() before trying to get target flags 2010-06-14 15:31:34 +02:00
Sebastian Dröge
899d2f0cec Use orc instead of liboil for CPU feature detection 2010-06-14 14:38:44 +02:00
Sebastian Dröge
c023b6a47a postproc: Mark postproc filters table as const 2010-03-24 16:37:37 +01:00
Sebastian Dröge
af3de9ac9f ffmpeg: Fix some remaining compiler warnings 2010-03-24 12:36:27 +01:00
Stefan Kost
0165bad2a8 ext/: Don't install static libs for plugins. Fixes #550851 for -ffmpeg.
Original commit message from CVS:
* ext/ffmpeg/Makefile.am:
* ext/libpostproc/Makefile.am:
* ext/libswscale/Makefile.am:
Don't install static libs for plugins. Fixes #550851 for -ffmpeg.
2008-11-04 12:49:40 +00:00
Alexis Ballier
42cf6d213f Update ffmpeg/swscale snapshot to the latest revision and adjust to API changes. Fixes bug #556405.
Original commit message from CVS:
Based on a patch by: Alexis Ballier <aballier at gentoo dot org>
* configure.ac:
* ext/ffmpeg/gstffmpeg.c:
* ext/ffmpeg/gstffmpeg.h:
* ext/ffmpeg/gstffmpegaudioresample.c:
* ext/ffmpeg/gstffmpegcfg.c: (gst_ffmpeg_flags_get_type),
(gst_ffmpeg_cfg_init):
* ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_codecid_to_caps),
(gst_ffmpeg_caps_to_pixfmt), (gst_ffmpeg_caps_with_codecid):
* ext/ffmpeg/gstffmpegcodecmap.h:
* ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_setcaps),
(gst_ffmpegdec_register):
* ext/ffmpeg/gstffmpegdeinterlace.c:
* ext/ffmpeg/gstffmpegdemux.c:
* ext/ffmpeg/gstffmpegenc.c: (gst_ffmpegenc_getcaps),
(gst_ffmpegenc_setcaps), (gst_ffmpegenc_register):
* ext/ffmpeg/gstffmpegmux.c:
* ext/ffmpeg/gstffmpegprotocol.c: (gst_ffmpegdata_seek):
* ext/libpostproc/gstpostproc.c:
* ffmpegrev:
Update ffmpeg/swscale snapshot to the latest revision and adjust
to API changes. Fixes bug #556405.
Require libavutil for swscale too when building with an external
ffmpeg and fix includes for external ffmpeg.
2008-10-30 12:05:45 +00:00
Sebastian Dröge
0d7adba925 Fix build with (Debian's) system ffmpeg. Fixes bug #532803.
Original commit message from CVS:
* configure.ac:
* ext/ffmpeg/gstffmpegcodecmap.c:
* ext/ffmpeg/gstffmpegdemux.c:
* ext/libpostproc/gstpostproc.c:
Fix build with (Debian's) system ffmpeg. Fixes bug #532803.
2008-05-13 15:07:25 +00:00
Gabriel Bouvigne
d6934dcd7c ext/libpostproc/gstpostproc.c: Support for non-I420 colorspaces in postproc
Original commit message from CVS:
Patch by: Gabriel Bouvigne  <bouvigne at mp3-tech dot org>
* ext/libpostproc/gstpostproc.c:
Support for non-I420 colorspaces in postproc
Fixes #496127
2008-05-06 14:31:22 +00:00
Andy Wingo
32bed94a31 Revert my patch, it was the badness.
Original commit message from CVS:
(gst_post_proc_transform_ip): Revert my patch, it was the badness.
2008-04-15 10:02:40 +00:00
Andy Wingo
223ea0d623 ext/libpostproc/gstpostproc.c (gst_post_proc_transform_ip): Fix some mistyping when calling pp_postprocess.
Original commit message from CVS:
2008-04-15  Andy Wingo  <wingo@pobox.com>

* ext/libpostproc/gstpostproc.c (gst_post_proc_transform_ip): Fix
some mistyping when calling pp_postprocess.
2008-04-15 09:11:52 +00:00
Edward Hervey
72b54f8e4c ffmpegrev: Bump upstream ffmpeg revision to todays
Original commit message from CVS:
* ffmpegrev: Bump upstream ffmpeg revision to todays
* configure.ac: Fix configure for build modification in upstream
* ext/libpostproc/gstpostproc.c: (gst_post_proc_transform_ip):
Fix build for modifications in upstream
2008-04-03 09:32:46 +00:00
Edward Hervey
bdadc136b2 Fix the build on MacOSX. since the one shipped by Apple is from the middle ages and is packed with issues.
Original commit message from CVS:
* configure.ac:
* ext/ffmpeg/Makefile.am:
* ext/libpostproc/Makefile.am:
Fix the build on MacOSX.
This requires a recent enough version of libtool (ex : 1.5.22), since
the one shipped by Apple is from the middle ages and is packed with
issues.
Fixes #435742
2007-05-17 15:46:17 +00:00
Josselin Mouette
1f2cd3de4b Allow building against an external FFMpeg install. Fixes: #363363
Original commit message from CVS:
* Makefile.am:
* configure.ac:
* ext/ffmpeg/Makefile.am:
* ext/ffmpeg/gstffmpeg.c:
* ext/ffmpeg/gstffmpegdemux.c:
* ext/libpostproc/Makefile.am:
* ext/libpostproc/gstpostproc.c:
Allow building against an external FFMpeg install. Fixes: #363363
Patch by: Josselin Mouette <joss at debian dot org>
When built against an external install, the plugin description will
say "system install" instead of "local snapshot"
2006-12-14 23:31:45 +00:00
Edward Hervey
8b9468e7c7 configure.ac: postproc filters need liboil to detect the cpu architecture
Original commit message from CVS:
Reviewed by: Edward Hervey  <edward@fluendo.com>
* configure.ac:
postproc filters need liboil to detect the cpu architecture
* ext/libpostproc/Makefile.am:
Update for liboil requirement, libpostproc being moved around in
ffmpeg mirror, and removal of unused header file.
* ext/libpostproc/gstpostproc.h:
Header file not needed anymore
* ext/libpostproc/gstpostproc.c: (gst_pp_scope_get_type),
(change_context), (append), (change_mode),
(gst_post_proc_base_init), (gst_post_proc_class_init),
(gst_post_proc_init), (gst_post_proc_dispose),
(gst_post_proc_setcaps), (gst_post_proc_transform_ip),
(gst_post_proc_set_property), (gst_post_proc_get_property),
(gst_post_proc_deblock_set_property),
(gst_post_proc_deblock_get_property),
(gst_post_proc_tmpnoise_set_property),
(gst_post_proc_tmpnoise_get_property),
(gst_post_proc_autolevels_set_property),
(gst_post_proc_autolevels_get_property),
(gst_post_proc_forcequant_set_property),
(gst_post_proc_forcequant_get_property), (gst_post_proc_register),
(plugin_init):
Port of postprocessing elements to 0.10.
2006-10-20 15:17:38 +00:00
Thomas Vander Stichele
9783a9207a expand tabs
Original commit message from CVS:
expand tabs
2005-12-06 19:57:08 +00:00
Andy Wingo
a02a444d68 Update for state change type and macro changes.
Original commit message from CVS:
2005-09-05  Andy Wingo  <wingo@pobox.com>

* Update for state change type and macro changes.
2005-09-05 14:06:29 +00:00
Ronald S. Bultje
6984879ed6 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.
2005-08-05 15:29:56 +00:00
Ronald S. Bultje
ada045509e ext/: Update to ffmpeg snapshot of Jul 20 2005 4:00 PM GMT. Mostly some added codecs, some API changes, etc. Also add...
Original commit message from CVS:
* ext/ffmpeg/gstffmpeg.h:
* ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_codecid_to_caps),
(gst_ffmpeg_caps_to_pixfmt), (gst_ffmpeg_formatid_get_codecids),
(gst_ffmpeg_caps_to_codecid), (gst_ffmpeg_get_codecid_longname),
(gst_ffmpeg_img_convert):
* ext/ffmpeg/gstffmpegcodecmap.h:
* ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_negotiate),
(gst_ffmpegdec_frame), (gst_ffmpegdec_chain),
(gst_ffmpegdec_register):
* ext/ffmpeg/gstffmpegdeinterlace.c:
(gst_ffmpegdeinterlace_getcaps), (gst_ffmpegdeinterlace_pad_link):
* ext/ffmpeg/gstffmpegdemux.c: (gst_ffmpegdemux_src_event),
(gst_ffmpegdemux_src_format_list), (gst_ffmpegdemux_src_query),
(gst_ffmpegdemux_src_convert), (gst_ffmpegdemux_add),
(gst_ffmpegdemux_register):
* ext/ffmpeg/gstffmpegenc.c: (gst_ffmpegenc_getcaps),
(gst_ffmpegenc_link), (gst_ffmpegenc_chain_video),
(gst_ffmpegenc_chain_audio):
* ext/ffmpeg/gstffmpegmux.c: (gst_ffmpegmux_request_new_pad),
(gst_ffmpegmux_connect), (gst_ffmpegmux_loop),
(gst_ffmpegmux_register):
* ext/ffmpeg/gstffmpegprotocol.c: (gst_ffmpegdata_write):
* ext/ffmpeg/gstffmpegscale.c: (gst_ffmpegscale_pad_link):
* ext/libpostproc/gstpostproc.c: (gst_postproc_chain):
Update to ffmpeg snapshot of Jul 20 2005 4:00 PM GMT. Mostly
some added codecs, some API changes, etc. Also adds a VOB muxer
for MPEG-2 video and adds h264 to .mp4 muxing.
2005-07-20 15:40:57 +00:00
Luca Ognibene
8254a0ff62 ext/libpostproc/gstpostproc.*: fix debug output
Original commit message from CVS:
* ext/libpostproc/gstpostproc.c: (gst_ffmpeg_log_callback),
(plugin_init):
* ext/libpostproc/gstpostproc.h:
fix debug output
2005-06-25 21:19:33 +00:00
Edward Hervey
7c05c7fc1e ext/libpostproc/gstpostproc.c: It works better when filing the hash_table BEFORE registering the element.
Original commit message from CVS:
* ext/libpostproc/gstpostproc.c: (gst_postproc_register):
It works better when filing the hash_table BEFORE registering the element.
2005-06-20 13:44:06 +00:00
Edward Hervey
d6e988fe96 ext/: ffmpeg's libpostproc wrapper plugins
Original commit message from CVS:
* ext/Makefile.am: (SUBDIRS):
* ext/libpostproc:
* ext/libpostproc/Makefile.am:
* ext/libpostproc/gstpostproc.c:
* ext/libpostproc/gstpostproc.h:
ffmpeg's libpostproc wrapper plugins
* configure.ac:
added --enable-pp to ffmpeg configure arguments
2005-06-20 13:07:52 +00:00