From bf0cb89a8d11d418cdf351fe5d91240ce92cd71d Mon Sep 17 00:00:00 2001 From: Luca Barbato Date: Sat, 21 Dec 2013 17:59:59 +0100 Subject: [PATCH 1/2] configure: Update freetype check to follow upstream The freetype tutorial suggests to use #include FT_FREETYPE_H. Bug-Id: 616 Signed-off-by: Luca Barbato (cherry picked from commit e61b8fa5605b16a02a2a0ea75afbfc31d7832bba) Conflicts: configure --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index f9eac08588..bcfbe4e6ec 100755 --- a/configure +++ b/configure @@ -2946,7 +2946,7 @@ enabled libdirac && require_pkg_config dirac \ "libdirac_decoder/dirac_parser.h libdirac_encoder/dirac_encoder.h" \ "dirac_decoder_init dirac_encoder_init" enabled libfaac && require2 libfaac "stdint.h faac.h" faacEncGetVersion -lfaac -enabled libfreetype && require_pkg_config freetype2 "ft2build.h freetype/freetype.h" FT_Init_FreeType +enabled libfreetype && require_pkg_config freetype2 "ft2build.h FT_FREETYPE_H" FT_Init_FreeType enabled libgsm && require libgsm gsm/gsm.h gsm_create -lgsm enabled libmp3lame && require "libmp3lame >= 3.98.3" lame/lame.h lame_set_VBR_quality -lmp3lame enabled libnut && require libnut libnut.h nut_demuxer_init -lnut From aedf1a2996e70d322220d2704d5a615c4f7b1b23 Mon Sep 17 00:00:00 2001 From: Reinhard Tartler Date: Thu, 13 Mar 2014 20:59:00 -0400 Subject: [PATCH 2/2] Update Changelog for 0.8.11 --- Changelog | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/Changelog b/Changelog index 7855c11324..6323e026e5 100644 --- a/Changelog +++ b/Changelog @@ -1,6 +1,26 @@ Entries are sorted chronologically from oldest to youngest within each release, releases are sorted from youngest to oldest. +version 0.8.11: + +- configure: Update freetype check to follow upstream +- drawtext: Drop pointless header +- configure: Support preprocessor macros as header names +- arm: hpeldsp: fix put_pixels8_y2_{,no_rnd_}armv6 +- arm: hpeldsp: prevent overreads in armv6 asm +- lagarith: reallocate rgb_planes when needed +- lagarith: avoid infinite loop in lag_rac_refill() +- lagarith: pad RGB buffer by 1 byte. +- truemotion1: check the header size +- shorten: pad the internal bitstream buffer +- samplefmt: avoid integer overflow in av_samples_get_buffer_size() +- h264: Fix a typo from the previous commit +- h264: Lower bound check for slice offsets +- rpza: limit the number of blocks to the total remaining blocks in the frame +- Prepare for 0.8.11 Release +- lavf: make av_probe_input_buffer more robust + + version 0.8.10: - oggparseogm: check timing variables