• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 094a4968
    Michael Niedermayer authored
    * 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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    094a4968
aacps.c 38.1 KB