Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 26 Aug 2011 21:18:54 +0000 (23:18 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 26 Aug 2011 21:18:54 +0000 (23:18 +0200)
commit094a4968188b0129d674c1369bad45a86cd0d46d
tree372eb9e7a5dc4222b7db34c5e10ae578b536ed9b
parent0a1cf6621067c4a85b519c8cad5c345c29017f89
parent1717ba0cdd587fe3463c1d8560f2c7e13fb21ba3
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>
20 files changed:
configure
ffserver.c
libavcodec/aac.h
libavcodec/aacps.c
libavcodec/aacps.h
libavcodec/aacps_tablegen.h
libavcodec/avcodec.h
libavcodec/mpeg4audio.h
libavcodec/mpegvideo.h
libavcodec/s3tc.h
libavcodec/snow.c
libavcodec/truespeech.c
libavcodec/vp3.c
libavfilter/vf_drawbox.c
libavformat/seek-test.c
libavutil/Makefile
libavutil/avutil.h
libavutil/fifo.c
libavutil/fifo.h
tools/pktdumper.c