• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 87dced80
    Michael Niedermayer authored
    * qatar/master:
      fix hardcoded tables compililation caused by missing math constants
      lavf: Make codec_tag arrays constant
      twinvq: give massive struct a name.
      lavf, lavu: version bumps and APIchanges for av_gettime() move
      lavfi/audio: don't set cur_buf in ff_filter_samples().
      lavfi/fifo: add audio version of the fifo filter.
      fifo: fix parenthesis placement.
      lavfi: rename vf_fifo.c -> fifo.c
      lavc: remove stats_in from AVCodecContext options table.
    
    Conflicts:
    	doc/APIchanges
    	libavfilter/Makefile
    	libavfilter/allfilters.c
    	libavfilter/audio.c
    	libavfilter/fifo.c
    	libavformat/version.h
    	libavutil/avutil.h
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    87dced80
cos_tablegen.c 2.2 KB