Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 13 Sep 2011 21:31:17 +0000 (23:31 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 13 Sep 2011 21:44:12 +0000 (23:44 +0200)
commitcac9877ed5150bb6feda64927bb327ee4698086a
tree17f92a30adce99c085b48a05f646f7cf13492952
parent5ad01decef9993e4ec84c10e53a01f9f841c330b
parente0c3e0738757a92c2910bac83f2ef830b428ba11
Merge remote-tracking branch 'qatar/master'

* 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: Michael Niedermayer <michaelni@gmx.at>
libavcodec/adpcm_data.h
libavcodec/mpeg12.c
libavcodec/xan.c
libswscale/Makefile
libswscale/x86/swscale_mmx.c
libswscale/x86/swscale_template.c