Sebastian Dröge
|
93e3ed5a86
|
Merge branch 'master' into 0.11
Conflicts:
ext/cairo/gsttextoverlay.c
ext/pulse/pulseaudiosink.c
gst/audioparsers/gstaacparse.c
gst/avi/gstavimux.c
gst/flv/gstflvmux.c
gst/interleave/interleave.c
gst/isomp4/gstqtmux.c
gst/matroska/matroska-demux.c
gst/matroska/matroska-mux.c
gst/matroska/matroska-mux.h
gst/matroska/matroska-read-common.c
gst/multifile/gstmultifilesink.c
gst/multipart/multipartmux.c
gst/shapewipe/gstshapewipe.c
gst/smpte/gstsmpte.c
gst/udp/gstmultiudpsink.c
gst/videobox/gstvideobox.c
gst/videocrop/gstaspectratiocrop.c
gst/videomixer/videomixer.c
gst/videomixer/videomixer2.c
gst/wavparse/gstwavparse.c
po/ja.po
po/lv.po
po/sr.po
tests/check/Makefile.am
tests/check/elements/qtmux.c
tests/check/elements/rgvolume.c
|
2012-01-10 14:32:32 +01:00 |
|
Mark Nauwelaerts
|
7480b4407e
|
qtmux: use GstCollectPads2 event callback
... in stead of local HACK.
|
2011-12-15 16:31:29 +01:00 |
|
Vincent Penquerc'h
|
79a6e23c1f
|
qtmux: port to GstCollectPads2
|
2011-12-14 19:02:23 +00:00 |
|
Wim Taymans
|
586ef0babd
|
Merge branch 'master' into 0.11
Conflicts:
ext/speex/gstspeexdec.c
ext/speex/gstspeexenc.c
gst/isomp4/atoms.c
gst/isomp4/gstqtmux.c
|
2011-10-06 12:23:39 +02:00 |
|
Thiago Santos
|
7a143ea94f
|
qtmux: Calculate average bitrate for streams
Calculate and use average bitrate for streams when no
bitrate tag was received
|
2011-09-30 12:43:13 -03:00 |
|
Mark Nauwelaerts
|
f886681367
|
isomp4: port to 0.11
|
2011-06-29 12:46:20 +02:00 |
|
Tim-Philipp Müller
|
c25bf5dc34
|
quicktime: rename plugin to isomp4
https://bugzilla.gnome.org/show_bug.cgi?id=648004
|
2011-04-30 17:58:02 +01:00 |
|