5 Commits

Author	SHA1	Message	Date
Michael Niedermayer	094a496818	Merge remote-tracking branch 'qatar/master' ... * qatar/master: fifo: add FIFO API test program, and fate test fifo: add av_fifo_peek2(), and deprecate av_fifo_peek() postprocess.c: filter name needs to be double 0 terminated doxygen: fix wrong comment syntax, //< vs. ///< doxygen: drop pointless star from pointer variable names Replace deprecated av_find_stream_info() by avformat_find_stream_info(). xmv: eliminate superfluous zeroing of zero data configure: fix typo in avconv dependency list Conflicts: configure doc/APIchanges libavutil/Makefile libavutil/avutil.h Merged-by: Michael Niedermayer <michaelni@gmx.at>	2011-08-26 23:18:54 +02:00
Diego Biurrun	0249478756	doxygen: fix wrong comment syntax, //< vs. ///<	2011-08-26 18:34:28 +02:00
Mans Rullgard	2912e87a6c	Replace FFmpeg with Libav in licence headers ... Signed-off-by: Mans Rullgard <mans@mansr.com>	2011-03-19 13:33:20 +00:00
Måns Rullgård	69d12904da	Remove unnecessary ../ from include directives ... Originally committed as revision 23806 to svn://svn.ffmpeg.org/ffmpeg/trunk	2010-06-26 20:28:44 +00:00
Alex Converse	fd6eb4a06c	Move Parametric Stereo related ps* files to aacps*. ... Originally committed as revision 23720 to svn://svn.ffmpeg.org/ffmpeg/trunk	2010-06-22 19:29:03 +00:00