diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-11 17:09:47 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-11 17:09:47 +0200 |
| commit | 6452b3159982565a56621f1d5a77b6a6e5306f70 (patch) | |
| tree | 17afc5fa9f78504b1836f71ac8bf92dd6e5b4af7 /libavutil/parseutils.c | |
| parent | a14969253a6cbb2958bf7c39acbb7d0056219111 (diff) | |
| parent | e2a83d72da866a29f5307a56f66c469966f02473 (diff) | |
| download | ffmpeg-6452b3159982565a56621f1d5a77b6a6e5306f70.tar.gz | |
Merge commit 'e2a83d72da866a29f5307a56f66c469966f02473' into release/2.2
* commit 'e2a83d72da866a29f5307a56f66c469966f02473':
Update Changelog for v10.1
Conflicts:
Changelog
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/parseutils.c')
0 files changed, 0 insertions, 0 deletions