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)
* 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:
1  2 
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

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge