diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-03-11 01:12:52 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-03-11 01:12:52 +0100 |
| commit | c3c2db49a7b10d0b57594332ee3c2cf4aa7552f2 (patch) | |
| tree | 917b2763af34e1b6ded7184a23a28ee1b6346e8b /libavformat/version.h | |
| parent | 6cb89df84596af0939a00496b381bcaa013ba929 (diff) | |
| parent | 442c3a8cb1785d74f8e2d7ab35b1862b7088436b (diff) | |
| download | ffmpeg-c3c2db49a7b10d0b57594332ee3c2cf4aa7552f2.tar.gz | |
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>
Diffstat (limited to 'libavformat/version.h')
0 files changed, 0 insertions, 0 deletions