diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-21 04:06:49 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-21 04:06:49 +0100 |
| commit | c7b8f02940ecb911fde566a578f3aae2eddf302f (patch) | |
| tree | dbd5cafcfa7d7255284c0cd9967250601e5ab8de /libavcodec/motion_est_template.c | |
| parent | 8a9feeff9e31e04bbd43a6279e89cba66a3691de (diff) | |
| parent | 606bbd50b1ebaa3c040fc7cab84f1d8bb5d3d248 (diff) | |
| download | ffmpeg-c7b8f02940ecb911fde566a578f3aae2eddf302f.tar.gz | |
Merge commit '606bbd50b1ebaa3c040fc7cab84f1d8bb5d3d248' into release/1.1
* commit '606bbd50b1ebaa3c040fc7cab84f1d8bb5d3d248':
Update Changelog for v9.17
Conflicts:
Changelog
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/motion_est_template.c')
0 files changed, 0 insertions, 0 deletions