diff options
| author | Michael Niedermayer <[email protected]> | 2015-01-18 03:54:58 +0100 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2015-01-18 03:54:58 +0100 |
| commit | 2b95572b10ec8188f7e4061046a0c66a8ebd8e85 (patch) | |
| tree | e40c02b714170f59e239a55d1a2bae9fd10be070 /libavfilter/libmpcodecs/vf_uspp.c | |
| parent | f5dd1270d9dd65cac47aab6045d25e4607695f4c (diff) | |
| parent | 5f6f2412211609e46d3f3573f4ac4e136534f1d4 (diff) | |
Merge commit '5f6f2412211609e46d3f3573f4ac4e136534f1d4' into release/2.4
* commit '5f6f2412211609e46d3f3573f4ac4e136534f1d4':
doc: Update the Changelog for release 11.2
Conflicts:
Changelog
No change as the changelog is not correct for FFmpeg
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavfilter/libmpcodecs/vf_uspp.c')
0 files changed, 0 insertions, 0 deletions