Merge remote branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 3 Apr 2011 00:28:01 +0000 (02:28 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 3 Apr 2011 00:28:01 +0000 (02:28 +0200)
commitf35439699f5546774b840ae9fba7df82729ef0ff
tree92c22313b8eda656421372955598d647aa64242e
parent85c9365d65c4d03c468cead13f722ddce89d8495
parentbc154882e11f4a218cc8cfb10ae0b4cbc83b5f9f
Merge remote branch 'qatar/master'

* qatar/master:
  Fixed-point MDCT with 32-bit unscaled output
  lavc: deprecate rate_emu
  lavc: mark hurry_up for removal on next major bump
  parser: mark av_parser_parse() for removal on next major bump
  lavc: add missing audioconvert includes
  jvdec: don't use deprecated CODEC_TYPE_*/PKT_FLAG_KEY

Conflicts:
libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
22 files changed:
libavcodec/avcodec.h
libavcodec/fft-internal.h
libavcodec/fft.c
libavcodec/fft.h
libavcodec/h261dec.c
libavcodec/h263dec.c
libavcodec/h264.c
libavcodec/jvdec.c
libavcodec/mdct_fixed.c
libavcodec/mlp_parser.c
libavcodec/mpeg12.c
libavcodec/mpegaudiodec.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo.h
libavcodec/options.c
libavcodec/parser.c
libavcodec/pthread.c
libavcodec/rv34.c
libavcodec/svq1dec.c
libavcodec/svq3.c
libavcodec/vc1dec.c
libavformat/jvdec.c