aboutsummaryrefslogtreecommitdiffstats
path: root/doc/Makefile
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-02-26 03:04:03 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-02-26 03:09:41 +0100
commitf64e4a8c9a19d086c4de99da76e5eb7b664e60d2 (patch)
tree56b12010d8efad70da58f59c05018d84e8383256 /doc/Makefile
parentd92a7870d74e199d143cdf1fa4606cbdef689e2c (diff)
parentdc745b76aa9a7682004c96372a9e77549de1b765 (diff)
downloadffmpeg-f64e4a8c9a19d086c4de99da76e5eb7b664e60d2.tar.gz
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@gmx.at>
Diffstat (limited to 'doc/Makefile')
0 files changed, 0 insertions, 0 deletions