Wim Taymans
710c519edd
Merge branch 'master' into 0.11
...
Conflicts:
gst/colorspace/colorspace.c
2012-02-21 10:06:16 +01:00
Wim Taymans
85f94fd1c7
Merge branch 'master' into 0.11
...
Conflicts:
ext/opus/gstopusparse.c
gst/colorspace/colorspace.c
2012-02-20 16:07:50 +01:00
Wim Taymans
bbf956433f
Merge branch 'master' into 0.11
2012-02-17 09:01:56 +01:00
Wim Taymans
aa6b23fc44
Merge branch 'master' into 0.11
...
Conflicts:
gst/mpegtsdemux/mpegtsbase.c
gst/mpegtsdemux/mpegtspacketizer.c
gst/mpegtsdemux/tsdemux.c
gst/mve/gstmvedemux.c
2012-02-16 14:33:20 +01:00
Mark Nauwelaerts
a21d2ec3d4
Merge branch 'master' into 0.11
2012-02-15 17:14:34 +01:00
Wim Taymans
8dccae3b73
Merge branch 'master' into 0.11
2012-02-14 11:19:04 +01:00
Wim Taymans
2751606732
Merge branch 'master' into 0.11
...
Conflicts:
ext/chromaprint/gstchromaprint.c
ext/mpeg2enc/Makefile.am
ext/voaacenc/gstvoaacenc.c
gst/dvbsuboverlay/gstdvbsuboverlay.c
gst/mpegtsdemux/mpegtsbase.c
gst/sdp/gstsdpdemux.c
gst/videoparsers/gsth264parse.c
sys/d3dvideosink/d3dvideosink.c
tests/examples/camerabin/gst-camera-perf.c
tests/examples/camerabin/gst-camerabin-test.c
tests/examples/camerabin2/gst-camerabin2-test.c
tests/examples/mxf/mxfdemux-structure.c
tests/examples/scaletempo/demo-main.c
2012-02-10 16:46:50 +01:00
Sebastian Dröge
2f63804633
Merge branch 'master' into 0.11
...
Conflicts:
configure.ac
ext/kate/gstkateenc.c
gst/colorspace/colorspace.c
gst/mpegvideoparse/mpegvideoparse.c
2012-01-25 13:22:43 +01:00
Tim-Philipp Müller
2ca9496cdc
Merge remote-tracking branch 'origin/master' into 0.11
2012-01-13 00:11:54 +00:00
Sebastian Dröge
3454e39b9d
Merge branch 'master' into 0.11
...
Conflicts:
gst/mpegtsdemux/tsdemux.c
gst/videoparsers/gsth264parse.c
tests/check/elements/camerabin2.c
2012-01-10 15:50:37 +01:00
Edward Hervey
25ad0fe0ed
Merge remote-tracking branch 'origin/master' into 0.11
...
Conflicts:
tests/examples/camerabin2/Makefile.am
2011-12-30 11:49:27 +01:00
Edward Hervey
c4ea888f41
Merge remote-tracking branch 'origin/master' into 0.11-premerge
...
Conflicts:
docs/libs/Makefile.am
ext/kate/gstkatetiger.c
ext/opus/gstopusdec.c
ext/xvid/gstxvidenc.c
gst-libs/gst/basecamerabinsrc/Makefile.am
gst-libs/gst/basecamerabinsrc/gstbasecamerasrc.c
gst-libs/gst/basecamerabinsrc/gstbasecamerasrc.h
gst-libs/gst/video/gstbasevideocodec.c
gst-libs/gst/video/gstbasevideocodec.h
gst-libs/gst/video/gstbasevideodecoder.c
gst-libs/gst/video/gstbasevideoencoder.c
gst/asfmux/gstasfmux.c
gst/audiovisualizers/gstwavescope.c
gst/camerabin2/gstcamerabin2.c
gst/debugutils/gstcompare.c
gst/frei0r/gstfrei0rmixer.c
gst/mpegpsmux/mpegpsmux.c
gst/mpegtsmux/mpegtsmux.c
gst/mxf/mxfmux.c
gst/videomeasure/gstvideomeasure_ssim.c
gst/videoparsers/gsth264parse.c
gst/videoparsers/gstmpeg4videoparse.c
2011-12-30 11:41:17 +01:00
Tim-Philipp Müller
43b1474807
Merge remote-tracking branch 'origin/master' into 0.11
2011-11-28 23:20:58 +00:00
Tim-Philipp Müller
fdbfd76680
Merge commit '7521b597f4dc49d8d168f368f0e7ebaf98a72156' into 0.11
2011-11-28 23:20:32 +00:00
Tim-Philipp Müller
d568733375
Merge commit '26d6add9457f00ce8ec13844368466f0e3816e5d' into 0.11
...
Conflicts:
ext/rtmp/gstrtmpsink.c
2011-11-28 23:20:02 +00:00
Tim-Philipp Müller
c1a4dc99ae
Merge remote-tracking branch 'origin/master' into 0.11
2011-11-27 23:33:45 +00:00
Tim-Philipp Müller
bbaf1dad99
Merge remote-tracking branch 'origin/master' into 0.11
...
Conflicts:
ext/opus/gstopusdec.c
ext/opus/gstopusparse.c
gst-libs/gst/video/gstbasevideodecoder.c
gst-libs/gst/video/gstbasevideodecoder.h
2011-11-26 15:37:25 +00:00
Edward Hervey
d459955d0d
Merge remote-tracking branch 'origin/master' into 0.11
...
Conflicts:
ext/faac/gstfaac.c
ext/opus/gstopusdec.c
ext/opus/gstopusenc.c
gst/audiovisualizers/gstspacescope.c
gst/colorspace/colorspace.c
2011-11-25 12:48:58 +01:00
Wim Taymans
e16e3e75e1
Merge branch 'master' into 0.11
...
Conflicts:
ext/opus/gstopusdec.c
ext/opus/gstopusenc.c
ext/opus/gstopusparse.c
gst/audiovisualizers/gstwavescope.c
gst/filter/Makefile.am
gst/filter/gstfilter.c
gst/filter/gstiir.c
gst/playondemand/gstplayondemand.c
2011-11-23 11:08:39 +01:00
Wim Taymans
eeb3f84489
Merge branch 'master' into 0.11
...
Conflicts:
ext/celt/gstceltdec.c
ext/opus/gstopusdec.c
ext/opus/gstopusdec.h
ext/opus/gstopusenc.c
ext/opus/gstopusenc.h
ext/opus/gstopusparse.c
2011-11-17 17:32:42 +01:00
Wim Taymans
bc402c0f8f
Merge branch 'master' into 0.11
2011-11-11 10:39:17 +01:00
Wim Taymans
a55fe10f48
Merge branch 'master' into 0.11
2011-11-10 18:34:48 +01:00
Wim Taymans
6bab67a8d9
Merge branch 'master' into 0.11
2011-11-10 12:14:19 +01:00
Wim Taymans
af2e81e3fc
Merge branch 'master' into 0.11
2011-11-09 12:24:37 +01:00
Wim Taymans
de76a3fe44
Merge branch 'master' into 0.11
...
Conflicts:
gst/colorspace/colorspace.c
2011-11-09 12:19:04 +01:00
Wim Taymans
47354d9997
Merge branch 'master' into 0.11
2011-11-07 10:02:00 +01:00
Wim Taymans
d51d8dd8b7
Merge branch 'master' into 0.11
2011-11-04 11:01:42 +01:00
Wim Taymans
7b0a9e0815
Merge branch 'master' into 0.11
2011-11-02 10:31:24 +01:00
Tim-Philipp Müller
52d8d0d060
Merge remote-tracking branch 'origin/master' into 0.11
2011-10-31 14:51:32 +00:00
Wim Taymans
0e109747ea
Merge branch 'master' into 0.11
2011-10-27 16:13:56 +02:00
Wim Taymans
89dbb9ea83
Merge branch 'master' into 0.11
2011-10-18 14:32:05 +02:00
Wim Taymans
5e010ab740
Merge branch 'master' into 0.11
2011-10-16 15:28:31 +02:00
Wim Taymans
705f3a1032
Merge branch 'master' into 0.11
2011-10-08 11:17:11 +02:00
Wim Taymans
ae79b905af
Merge branch 'master' into 0.11
2011-10-06 14:05:42 +02:00
Wim Taymans
325d347f68
Merge branch 'master' into 0.11
2011-10-04 13:29:21 +02:00
Wim Taymans
d9e286d14c
Merge branch 'master' into 0.11
2011-10-03 11:24:04 +02:00
Wim Taymans
0e353048da
Merge branch 'master' into 0.11
2011-09-26 22:31:17 +02:00
Wim Taymans
6c9c1a3014
Merge branch 'master' into 0.11
2011-09-06 16:13:28 +02:00
Wim Taymans
d764a84c59
Merge branch 'master' into 0.11
...
Conflicts:
ext/resindvd/rsnwrappedbuffer.c
2011-08-25 12:49:26 +02:00
Wim Taymans
721204bb32
Merge branch 'master' into 0.11
2011-08-17 19:01:39 +02:00
Wim Taymans
350d033cca
Merge branch 'master' into 0.11
2011-08-04 09:40:46 +02:00
Wim Taymans
55aba366e4
Merge branch 'master' into 0.11
...
Conflicts:
common
configure.ac
gst/colorspace/colorspace.c
gst/colorspace/colorspace.h
gst/colorspace/gstcolorspace.c
2011-08-04 09:36:07 +02:00
Wim Taymans
3687fe05e4
Merge branch 'master' into 0.11
...
Conflicts:
android/aacparse.mk
android/amrparse.mk
android/h264parse.mk
android/metadata.mk
android/qtmux.mk
android/sdpelem.mk
configure.ac
gst/qtmux/gstqtmux.c
win32/common/config.h
2011-06-15 16:06:36 +02:00
Thibault Saunier
81b71b65ee
android: make it ready for androgenizer
...
Remove the android/ top dir
Fixe the Makefile.am to be androgenized
To build gstreamer for android we are now using androgenizer which generates the needed Android.mk files.
Androgenizer can be found here: http://git.collabora.co.uk/?p=user/derek/androgenizer.git
2011-04-11 07:27:11 +02:00
Sebastian Dröge
1fe4e2ad2a
audioparse: Add support for setting the channel-positions
2010-10-07 10:34:48 +02:00
Руслан Ижбулатов
3d93c65415
resindvd, rawparse: fix LDFLAGS for gst-plugins-base libs
...
Fixes #593063 .
2009-08-25 23:55:41 +01:00
Sebastian Dröge
4b122ec93d
videoparse: Use libgstvideo for everything instead of our own calculations
...
Also make RGB usage easier by providing xRGB, RGBx, etc. formats
instead of requiring to set red_mask and friends.
2009-08-08 09:08:16 +02:00
Stefan Kost
4e30d66568
Don't install static libs for plugins. Fixes #550851 for -bad.
...
Original commit message from CVS:
* ext/alsaspdif/Makefile.am:
* ext/amrwb/Makefile.am:
* ext/apexsink/Makefile.am:
* ext/arts/Makefile.am:
* ext/artsd/Makefile.am:
* ext/audiofile/Makefile.am:
* ext/audioresample/Makefile.am:
* ext/bz2/Makefile.am:
* ext/cdaudio/Makefile.am:
* ext/celt/Makefile.am:
* ext/dc1394/Makefile.am:
* ext/dirac/Makefile.am:
* ext/directfb/Makefile.am:
* ext/divx/Makefile.am:
* ext/dts/Makefile.am:
* ext/faac/Makefile.am:
* ext/faad/Makefile.am:
* ext/gsm/Makefile.am:
* ext/hermes/Makefile.am:
* ext/ivorbis/Makefile.am:
* ext/jack/Makefile.am:
* ext/jp2k/Makefile.am:
* ext/ladspa/Makefile.am:
* ext/lcs/Makefile.am:
* ext/libfame/Makefile.am:
* ext/libmms/Makefile.am:
* ext/metadata/Makefile.am:
* ext/mpeg2enc/Makefile.am:
* ext/mplex/Makefile.am:
* ext/musepack/Makefile.am:
* ext/musicbrainz/Makefile.am:
* ext/mythtv/Makefile.am:
* ext/nas/Makefile.am:
* ext/neon/Makefile.am:
* ext/ofa/Makefile.am:
* ext/polyp/Makefile.am:
* ext/resindvd/Makefile.am:
* ext/sdl/Makefile.am:
* ext/shout/Makefile.am:
* ext/snapshot/Makefile.am:
* ext/sndfile/Makefile.am:
* ext/soundtouch/Makefile.am:
* ext/spc/Makefile.am:
* ext/swfdec/Makefile.am:
* ext/tarkin/Makefile.am:
* ext/theora/Makefile.am:
* ext/timidity/Makefile.am:
* ext/twolame/Makefile.am:
* ext/x264/Makefile.am:
* ext/xine/Makefile.am:
* ext/xvid/Makefile.am:
* gst-libs/gst/app/Makefile.am:
* gst-libs/gst/dshow/Makefile.am:
* gst/aiffparse/Makefile.am:
* gst/app/Makefile.am:
* gst/audiobuffer/Makefile.am:
* gst/bayer/Makefile.am:
* gst/cdxaparse/Makefile.am:
* gst/chart/Makefile.am:
* gst/colorspace/Makefile.am:
* gst/dccp/Makefile.am:
* gst/deinterlace/Makefile.am:
* gst/deinterlace2/Makefile.am:
* gst/dvdspu/Makefile.am:
* gst/festival/Makefile.am:
* gst/filter/Makefile.am:
* gst/flacparse/Makefile.am:
* gst/flv/Makefile.am:
* gst/games/Makefile.am:
* gst/h264parse/Makefile.am:
* gst/librfb/Makefile.am:
* gst/mixmatrix/Makefile.am:
* gst/modplug/Makefile.am:
* gst/mpeg1sys/Makefile.am:
* gst/mpeg4videoparse/Makefile.am:
* gst/mpegdemux/Makefile.am:
* gst/mpegtsmux/Makefile.am:
* gst/mpegvideoparse/Makefile.am:
* gst/mve/Makefile.am:
* gst/nsf/Makefile.am:
* gst/nuvdemux/Makefile.am:
* gst/overlay/Makefile.am:
* gst/passthrough/Makefile.am:
* gst/pcapparse/Makefile.am:
* gst/playondemand/Makefile.am:
* gst/rawparse/Makefile.am:
* gst/real/Makefile.am:
* gst/rtjpeg/Makefile.am:
* gst/rtpmanager/Makefile.am:
* gst/scaletempo/Makefile.am:
* gst/sdp/Makefile.am:
* gst/selector/Makefile.am:
* gst/smooth/Makefile.am:
* gst/smoothwave/Makefile.am:
* gst/speed/Makefile.am:
* gst/speexresample/Makefile.am:
* gst/stereo/Makefile.am:
* gst/subenc/Makefile.am:
* gst/tta/Makefile.am:
* gst/vbidec/Makefile.am:
* gst/videodrop/Makefile.am:
* gst/videosignal/Makefile.am:
* gst/virtualdub/Makefile.am:
* gst/vmnc/Makefile.am:
* gst/y4m/Makefile.am:
* sys/acmenc/Makefile.am:
* sys/cdrom/Makefile.am:
* sys/dshowdecwrapper/Makefile.am:
* sys/dshowsrcwrapper/Makefile.am:
* sys/dvb/Makefile.am:
* sys/dxr3/Makefile.am:
* sys/fbdev/Makefile.am:
* sys/oss4/Makefile.am:
* sys/qcam/Makefile.am:
* sys/qtwrapper/Makefile.am:
* sys/vcd/Makefile.am:
* sys/wininet/Makefile.am:
* win32/common/config.h:
Don't install static libs for plugins. Fixes #550851 for -bad.
2008-11-04 12:42:30 +00:00
Christian Schaller
a9b19a8a00
Add missing no_inst header files to Makefile.am so disting still works
...
Original commit message from CVS:
Add missing no_inst header files to Makefile.am so disting still works
Update spec file with latest changes
2008-01-23 13:18:24 +00:00
Sebastian Dröge
ca5193d055
Add new plugin rawparse that contains a base class for raw data parsers and the two elements audioparse and videopars...
...
Original commit message from CVS:
* configure.ac:
* gst/rawparse/Makefile.am:
* gst/rawparse/README:
* gst/rawparse/gstaudioparse.c: (gst_audio_parse_format_get_type),
(gst_audio_parse_endianness_get_type), (gst_audio_parse_base_init),
(gst_audio_parse_class_init), (gst_audio_parse_init),
(gst_audio_parse_set_property), (gst_audio_parse_get_property),
(gst_audio_parse_update_frame_size), (gst_audio_parse_get_caps):
* gst/rawparse/gstaudioparse.h:
* gst/rawparse/gstrawparse.c: (gst_raw_parse_base_init),
(gst_raw_parse_class_init), (gst_raw_parse_init),
(gst_raw_parse_dispose),
(gst_raw_parse_class_set_src_pad_template),
(gst_raw_parse_class_set_multiple_frames_per_buffer),
(gst_raw_parse_reset), (gst_raw_parse_chain),
(gst_raw_parse_convert), (gst_raw_parse_sink_event),
(gst_raw_parse_src_event), (gst_raw_parse_src_query_type),
(gst_raw_parse_src_query), (gst_raw_parse_set_framesize),
(gst_raw_parse_set_fps), (gst_raw_parse_get_fps),
(gst_raw_parse_is_negotiated):
* gst/rawparse/gstrawparse.h:
* gst/rawparse/gstvideoparse.c: (gst_video_parse_format_get_type),
(gst_video_parse_endianness_get_type), (gst_video_parse_base_init),
(gst_video_parse_class_init), (gst_video_parse_init),
(gst_video_parse_set_property), (gst_video_parse_get_property),
(gst_video_parse_format_to_fourcc),
(gst_video_parse_update_frame_size), (gst_video_parse_get_caps):
* gst/rawparse/gstvideoparse.h:
* gst/rawparse/plugin.c: (plugin_init):
Add new plugin rawparse that contains a base class for raw data
parsers and the two elements audioparse and videoparse that can
be used to parse raw audio and video. These are inspired by the
old videoparse element which the new rawparse plugin deprecates.
2007-12-23 06:22:32 +00:00