Conflicts:
ext/pulse/pulseaudiosink.c
ext/pulse/pulsesrc.c
gst/audioparsers/gstaacparse.c
gst/audioparsers/gstamrparse.c
gst/audioparsers/gstdcaparse.c
gst/audioparsers/gstflacparse.c
gst/effectv/gstradioac.c
gst/effectv/gstradioac.h
gst/effectv/gstripple.c
Some possible FIXMEs remaining in the audio parser getcaps functions.
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
Add a property to allow control over what event causes a file
to finish being written and a new file start. The default is
the same as before -- each buffer causes a new file to be
written. Added is a case where buffers are written to the
same file until a discontinuity in the stream.
Link to properties. Correct titles for examples. Document a few trivial cases. Keep lists in section file and docs/plugins/Makefile.am alphabetically ordered.
Original commit message from CVS:
* gst/multifile/gstmultifilesrc.c: (gst_multi_file_src_class_init),
(gst_multi_file_src_query):
Implement DEFAULT and BUFFER position queries. See #555260.
Original commit message from CVS:
* gst/multifile/gstmultifilesrc.c: (gst_multi_file_src_create):
* tests/check/elements/multifile.c: (GST_START_TEST):
Close some memory leaks spotted by the unit test. Fixes bug #515697.
Original commit message from CVS:
* gst/multifile/gstmultifilesrc.c: (gst_multi_file_src_create):
Need to use gsize here for the size, fixes compiler warning.
* tests/examples/equalizer/.cvsignore:
* tests/examples/equalizer/Makefile.am:
* tests/examples/spectrum/.cvsignore:
* tests/examples/spectrum/Makefile.am:
Add missing files to fix the build.
Original commit message from CVS:
* gst/multifile/gstmultifilesink.c:
* gst/multifile/gstmultifilesrc.c:
Use g_file_[sg]et_contents() instead of using stdio functions.
Should be less error prone.
* tests/check/elements/multifile.c:
Create a temporary directory using standard functions instead of
creating a directory in the current dir.
Original commit message from CVS:
* gst/multifile/gstmultifilesink.c:
Add a fixme comment.
* gst/selector/gstoutputselector.c:
Fix same leak as in input-selector.
* tests/icles/output-selector-test.c:
Improve the test.
Original commit message from CVS:
* gst/multifile/gstmultifilesrc.c:
* gst/multifile/gstmultifilesrc.h:
When subsequent files are read, if the file doesn't exist, send
an EOS instead of causing an error.
Original commit message from CVS:
* gst/multifile/gstmultifilesrc.c: (gst_multi_file_src_create):
Add example to the docs. Fix buffer-offset-end and add some debug.
Original commit message from CVS:
* gst/multifile/Makefile.am:
* gst/multifile/gstmultifile.c:
* gst/multifile/gstmultifilesink.c:
* gst/multifile/gstmultifilesink.h:
* gst/multifile/gstmultifilesrc.c:
* gst/multifile/gstmultifilesrc.h:
Add .h files to be able to add it to the docs.
Original commit message from CVS:
* gst/multifile/gstmultifilesink.c:
(gst_multi_file_sink_class_init):
* gst/multifile/gstmultifilesrc.c: (gst_multi_file_src_class_init):
* gst/mve/gstmvedemux.c: (gst_mve_video_create_buffer),
(gst_mve_video_palette), (gst_mve_video_code_map),
(gst_mve_audio_init), (gst_mve_audio_data), (gst_mve_timer_create),
(gst_mve_demux_chain):
* gst/mve/gstmvemux.c: (gst_mve_mux_push_chunk):
* gst/mve/mveaudioenc.c: (mve_compress_audio):
* gst/mve/mvevideodec16.c: (ipvideo_copy_block):
* gst/mve/mvevideodec8.c: (ipvideo_copy_block):
* gst/mve/mvevideoenc16.c: (mve_encode_frame16):
* gst/mve/mvevideoenc8.c: (mve_encode_frame8):
Use proper print statements.
Fixes build on mac os x.
<wingo> oo look at me my name is edward i'm hacking on macos wooo