Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 2 Jul 2011 01:07:06 +0000 (03:07 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 2 Jul 2011 01:24:32 +0000 (03:24 +0200)
commit3074f03a074de3aab79639d261cbd0ccc265b5b4
tree9710041e852ee69f6de6ef6e6333af82f6ca5931
parent392acaedcb052fa64386d5d0aea4931386f72d64
parent23ce6e72123a40895baaeefeb27c7c18748bd67e
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  get_bits: remove x86 inline asm in A32 bitstream reader
  doc: Remove outdated information about our issue tracker
  avidec: Factor out the sync fucntionality.
  fate-aac: Expand coverage.
  ac3dsp: add x86-optimized versions of ac3dsp.extract_exponents().
  ac3dsp: simplify extract_exponents() now that it does not need to do clipping.
  ac3enc: clip coefficients after MDCT.
  ac3enc: add int32_t array clipping function to DSPUtil, including x86 versions.
  swscale: for >8bit scaling, read in native bit-depth.
  matroskadec: matroska_read_seek after after EBML_STOP leads to failure.
  doxygen: fix usage of @file directive in libavutil/{dict,file}.h
  doxygen: Help doxygen parser to understand the DECLARE_ALIGNED and offsetof macros

Conflicts:
doc/issue_tracker.txt
libavformat/avidec.c
libavutil/dict.h
libswscale/swscale.c
libswscale/utils.c
tests/ref/lavfi/pixfmts_scale

Merged-by: Michael Niedermayer <michaelni@gmx.at>
17 files changed:
Doxyfile
libavcodec/ac3dsp.c
libavcodec/ac3enc.h
libavcodec/ac3enc_fixed.c
libavcodec/ac3enc_float.c
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/get_bits.h
libavcodec/x86/ac3dsp.asm
libavcodec/x86/ac3dsp_mmx.c
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/dsputil_yasm.asm
libavformat/avidec.c
libavformat/matroskadec.c
libavutil/dict.h
libavutil/file.h
libswscale/swscale.c