ffmpeg/tests/ref
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
..
acodec
fate Merge remote-tracking branch 'qatar/master' 2011-08-26 23:18:54 +02:00
lavf dv: honor timecode in DV muxer. 2011-08-13 19:13:03 +02:00
lavfi sws: use shift for chroma sample up convertion 2011-08-25 14:49:29 +02:00
seek Merge remote-tracking branch 'qatar/master' 2011-07-09 02:06:40 +02:00
vsynth1 Merge remote-tracking branch 'qatar/master' 2011-08-13 22:24:47 +02:00
vsynth2 Merge remote-tracking branch 'qatar/master' 2011-08-13 22:24:47 +02:00