Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 11 Mar 2012 00:12:52 +0000 (01:12 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 11 Mar 2012 00:12:52 +0000 (01:12 +0100)
commitc3c2db49a7b10d0b57594332ee3c2cf4aa7552f2
tree917b2763af34e1b6ded7184a23a28ee1b6346e8b
parent6cb89df84596af0939a00496b381bcaa013ba929
parent442c3a8cb1785d74f8e2d7ab35b1862b7088436b
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  cook: expand dither_tab[], and make sure indexes into it don't overflow.
  xxan: reindent xan_unpack_luma().
  xxan: protect against chroma LUT overreads.
  xxan: convert to bytestream2 API.
  xxan: don't read before start of buffer in av_memcpy_backptr().
  vp8: convert mbedge loopfilter x86 assembly to use named arguments.
  vp8: convert inner loopfilter x86 assembly to use named arguments.

Conflicts:
libavcodec/xxan.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/cook.c
libavcodec/cookdata.h
libavcodec/x86/vp8dsp.asm
libavcodec/xxan.c