diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-03 00:57:09 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-03 01:01:32 +0200 |
| commit | 2f894deeda18bf9162d7ceb96fa83253e331a37e (patch) | |
| tree | ac30d1aaeb48cc86b92ae06a2e50cee514371826 /doc/examples/decoding_encoding.c | |
| parent | e771425e985efd140474c2bc93333da6de14edee (diff) | |
| parent | aedf1a2996e70d322220d2704d5a615c4f7b1b23 (diff) | |
| download | ffmpeg-2f894deeda18bf9162d7ceb96fa83253e331a37e.tar.gz | |
Merge commit 'aedf1a2996e70d322220d2704d5a615c4f7b1b23' into release/0.10
* commit 'aedf1a2996e70d322220d2704d5a615c4f7b1b23':
Update Changelog for 0.8.11
configure: Update freetype check to follow upstream
Conflicts:
Changelog
Changelog not merged as it does not match for FFmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/examples/decoding_encoding.c')
0 files changed, 0 insertions, 0 deletions