Tim-Philipp Müller
|
177525f89f
|
Merge remote-tracking branch 'origin/master' into 0.11
Conflicts:
gst-libs/gst/netbuffer/gstnetbuffer.c
gst/ffmpegcolorspace/avcodec.h
gst/ffmpegcolorspace/gstffmpegcodecmap.c
gst/ffmpegcolorspace/imgconvert.c
gst/ffmpegcolorspace/imgconvert_template.h
gst/ffmpegcolorspace/mem.c
gst/playback/README
gst/playback/gstplaybasebin.c
gst/playback/gstplaybasebin.h
gst/playback/gstplaybin.c
sys/v4l/v4lmjpegsrc_calls.c
sys/v4l/videodev_mjpeg.h
tests/check/elements/gnomevfssink.c
|
2011-12-02 11:10:17 +00:00 |
|
Piotr Fusik
|
14644457b0
|
various: typo fixes
Fix typos in code and docs. Fixes. #658984
|
2011-12-02 12:03:27 +01:00 |
|
Wim Taymans
|
7402d3a3d2
|
update for _get_caps() -> _query_caps()
|
2011-11-15 18:04:17 +01:00 |
|
Sebastian Dröge
|
7f6697020e
|
tests: Update for negotiation related API changes
|
2011-05-16 15:35:41 +02:00 |
|
Edward Hervey
|
19201c1ab0
|
encoding: encoding_profile_get_output_caps => _get_input_caps
Makes more sense name-wise
|
2011-01-05 22:02:35 +01:00 |
|
Edward Hervey
|
a5994446b3
|
examples: encoding example
Along with gstcapslist
|
2010-12-15 11:54:32 +01:00 |
|