Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 21 Jun 2012 19:57:39 +0000 (21:57 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 21 Jun 2012 20:37:43 +0000 (22:37 +0200)
commit87dced8074cf83e74e69d7dee725c8d62601c4e8
tree7fda3c5c5510001e32cbbeddc4030e5e84df1138
parentfd0b8c6ad53ff2a01868ecf1bbf0c936876a0c61
parent1d01fee980edf60215acd94daf2533a9fefb9342
Merge remote-tracking branch 'qatar/master'

* 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: Michael Niedermayer <michaelni@gmx.at>
15 files changed:
configure
doc/APIchanges
libavcodec/aacps_tablegen.h
libavcodec/cos_tablegen.c
libavcodec/options_table.h
libavcodec/sinewin_tablegen.c
libavcodec/twinvq_data.h
libavfilter/Makefile
libavfilter/allfilters.c
libavfilter/audio.c
libavfilter/fifo.c
libavformat/cafdec.c
libavformat/ivfdec.c
libavformat/version.h
libavutil/avutil.h