Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 19 May 2011 03:12:45 +0000 (05:12 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 19 May 2011 04:00:31 +0000 (06:00 +0200)
commit75a37b57a59f6701d9443c5f7a0ceec108b27a18
tree1eea866003f3d7385261dea40b5b8063e87f9b8a
parent8529f9b36b7c1b8f2cb36ba2709983517c4b6458
parent41e21e4db623ebd77f431a6f30cf21d62d9e1f33
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  APIchanges: fill in date and commit for request_sample_fmt
  Add floating-point sample format support to the ac3, eac3, dca, aac, and vorbis decoders.
  Add support for request_sample_format in ffmpeg and ffplay.
  Add APIchanges entry for request_sample_fmt.
  Add request_sample_fmt field to AVCodecContext.
  Add float_interleave() to FmtConvertContext with x86-optimized versions.
  Remove unused make variable SEEK_REFFILE
  fate: remove redundant aref and vref references
  fate: remove do_ffmpeg_nocheck function
  fate: do not collect -benchmark output
  mpegaudiodec: remove decode_end() function
  fate: run aref and vref as regular tests
  mpegaudio: sanitise compute_antialias_* names
  mpeg12: add slice-threading checks to slice-threading initializers.
  h264: copy pixel_shift between slice threading contexts.
  mdec: enable frame-level multithreading.
  mdec.c: fix overread.

Conflicts:
libavcodec/aacdec.c
libavcodec/ac3dec.c
libavcodec/avcodec.h
libavcodec/dca.c
libavcodec/h264.c
libavcodec/mdec.c
libavcodec/mpeg12.c
libavcodec/options.c
libavcodec/version.h
libavcodec/vorbisdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
21 files changed:
Makefile
doc/APIchanges
libavcodec/aacdec.c
libavcodec/aacsbr.c
libavcodec/aacsbr.h
libavcodec/ac3dec.c
libavcodec/avcodec.h
libavcodec/dca.c
libavcodec/fmtconvert.c
libavcodec/fmtconvert.h
libavcodec/h264.c
libavcodec/mdec.c
libavcodec/mpeg12.c
libavcodec/mpegaudiodec.c
libavcodec/mpegaudiodec_float.c
libavcodec/options.c
libavcodec/vorbisdec.c
libavcodec/x86/fmtconvert.asm
libavcodec/x86/fmtconvert_mmx.c
tests/codec-regression.sh
tests/lavfi-regression.sh