• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · cd8cb549
    Michael Niedermayer authored
    * 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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    cd8cb549
h264dsp_mmx.c 20.9 KB