• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · cac9877e
    Michael Niedermayer authored
    * qatar/master:
      sws: implement MMX/SSE2/SSSE3/SSE4 versions for horizontal scaling.
      include stdint.h in adpcm_data.h
      mpeg12: reorder functions to avoid ugly forward declarations
      Fixed off by one packet size allocation in the smacker demuxer.
      Check for invalid packet size in the smacker demuxer.
      ape demuxer: fix segfault on memory allocation failure.
      xan: Add some buffer checks
      xan: Remove extra trailing newline
      Fixed size given to init_get_bits() in xan decoder.
    
    Conflicts:
    	libavcodec/mpeg12.c
    	libswscale/x86/swscale_template.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    cac9877e
adpcm_data.h 1.27 KB