• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 7c6c4cf2
    Michael Niedermayer authored
    * qatar/master:
      Remove h264_lowres_idct_put/add functions
      Remove snow/dwt test program
      h264: remove some disabled code
      Fix incorrect max_lowres values
      matroskadec: fix integer underflow if header length < probe length.
      cosmetics: indentation
      eac3enc: use frame exponent strategy when applicable.
      cosmetics: rename eac3dec_data.c/h to eac3_data.c/h since the tables will also be used in the E-AC-3 encoder.
      dsputil: fix ff_check_alignment()
    
    Conflicts:
    	libavcodec/Makefile
    	libavcodec/h264idct_template.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    7c6c4cf2
Makefile 41.7 KB