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 |
|
Wim Taymans
|
ee7072fe7e
|
rename GstBaseAudio* ->GstAudioBase*
|
2011-11-11 11:52:47 +01:00 |
|
Wim Taymans
|
3d0ac3ded2
|
rename files to match contained objects
|
2011-11-11 11:33:15 +01:00 |
|
Wim Taymans
|
ad8f694ec6
|
remove bogus files
They got somehow commited in 7012e88090
|
2011-11-11 10:39:52 +01:00 |
|
Wim Taymans
|
7012e88090
|
Merge branch 'master' into 0.11
Conflicts:
gst-libs/gst/audio/audio.h
gst-libs/gst/audio/gstaudiodecoder.c
gst-libs/gst/audio/gstaudiodecoder.h
gst-libs/gst/audio/gstaudioencoder.c
gst-libs/gst/audio/gstbaseaudioencoder.h
gst/playback/Makefile.am
gst/playback/gstplaybin.c
gst/playback/gstplaysink.c
gst/playback/gstplaysinkvideoconvert.c
gst/playback/gstsubtitleoverlay.c
gst/videorate/gstvideorate.c
gst/videoscale/gstvideoscale.c
win32/common/libgstaudio.def
|
2011-09-06 15:24:32 +02:00 |
|