• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 2c5a2958
    Michael Niedermayer authored
    * qatar/master:
      h264: Factorize declaration of mb_sizes array.
      vsrc_buffer: when no frame is available, return an error instead of segfaulting.
      configure: add dl to frei0r extralibs.
      dsputil x86: use SSE float instruction instead of SSE2 integer equivalent
      dsputil x86: remove deprecated parameter from scalarproduct_int16 prototype
      vp8dsp x86: perform rounding shift with a single instruction
      fate: add BMP tests.
      swscale: handle complete dimensions for monoblack/white.
      aacenc: Mark deinterleave_input_samples argument as const.
      vf_unsharp: Mark readonly variable as const.
      h264: fix 4:2:2 PCM-macroblocks decoding
    
    Conflicts:
    	configure
    	libavcodec/h264.h
    	libavcodec/x86/dsputil_mmx.c
    	libavfilter/vf_unsharp.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    2c5a2958
aacenc.c 27.6 KB