• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · c3c2db49
    Michael Niedermayer authored
    * 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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    c3c2db49
xxan.c 12.7 KB