• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 7a02527b
    Michael Niedermayer authored
    * qatar/master:
      ac3enc: use correct alignment and length in channel coupling dsp functions.
      ffmpeg: don't abuse a global for passing framerate from input to output
      ffmpeg: don't abuse a global for passing channels from input to output
      ffmpeg: don't abuse a global for passing samplerate from input to output
      ARM: update ff_h264_idct8_add4_neon for 4:4:4 changes
      swscale: use SwsContext for av_log when available
      swscale: Remove HAVE_MMX from files that are only compiled with MMX enabled.
      swscale: Fix compilation with --disable-mmx2.
    
    Conflicts:
    	ffmpeg.c
    	libswscale/utils.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    7a02527b
swscale_mmx.c 8.26 KB