[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/release/9' into release/1.1
Michael Niedermayer
git at videolan.org
Tue Feb 26 03:39:04 CET 2013
ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Tue Feb 26 03:04:03 2013 +0100| [f64e4a8c9a19d086c4de99da76e5eb7b664e60d2] | committer: Michael Niedermayer
Merge remote-tracking branch 'qatar/release/9' into release/1.1
* qatar/release/9:
doc: developer: Allow tabs in the vim configuration for Automake files
doc: filters: Correct BNF FILTER description
Prepare for 9.3 Release
update Changelog
cavs: initialize various context tables to 0
4xm: check the return value of read_huffman_tables().
qtrle: add more checks against pixel_ptr being negative.
mlpdec: do not try to allocate a zero-sized output buffer.
av_memcpy_backptr: avoid an infinite loop for back = 0
flicvideo: avoid an infinite loop in byte run compression
lagarith: avoid infinite loop in lag_rac_refill()
mov: use the format context for logging.
loco: check that there is data left after decoding a plane.
update Changelog
x86: h264: Don't use redzone in AVX h264_deblock on Win64
Conflicts:
Changelog
RELEASE
libavcodec/4xm.c
libavcodec/loco.c
libavcodec/qtrle.c
libavutil/mem.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f64e4a8c9a19d086c4de99da76e5eb7b664e60d2
---
More information about the ffmpeg-cvslog
mailing list