Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 2 Jun 2011 03:12:10 +0000 (05:12 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 2 Jun 2011 03:12:10 +0000 (05:12 +0200)
commitcd8cb54990be4fbd23e28f9d7c2c6170d3667692
tree28965f743e1e731b5a7616cbd7b0551c416da327
parent06a9da736554197601e4062298fcf45a5e8d49ff
parent8e112df409061034202b98fcc6ce2c1c670c0dda
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  ARM: ac3dsp: optimised update_bap_counts()
  mpegaudiodec: Fix av_dlog() invocation.
  h264/10bit: add HAVE_ALIGNED_STACK checks.
  Update 8-bit H.264 IDCT function names to reflect bit-depth.
  Add IDCT functions for 10-bit H.264.
  mpegaudioenc: Fix broken av_dlog statement.
  Employ correct printf format specifiers, mostly in debug output.
  ARM: fix MUL64 inline asm for pre-armv6

Conflicts:
libavcodec/mpegaudioenc.c
libavformat/ape.c
libavformat/mxfdec.c
libavformat/r3d.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 files changed:
libavcodec/arm/ac3dsp_init_arm.c
libavcodec/arm/mathops.h
libavcodec/h264dsp.h
libavcodec/mpegaudiodec.c
libavcodec/mpegaudioenc.c
libavcodec/x86/Makefile
libavcodec/x86/h264_idct.asm
libavcodec/x86/h264dsp_mmx.c
libavfilter/vsrc_movie.c
libavformat/ape.c
libavformat/mxfdec.c
libavformat/r3d.c