diff options
| author | Michael Niedermayer <[email protected]> | 2014-03-23 20:11:49 +0100 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2014-03-23 20:29:23 +0100 |
| commit | 5b0e2eb041db4e86a1d69d2578e0631aaaf4e53b (patch) | |
| tree | c818a62b7c5f4e8ab7f193c7b7ab9998af7fe8fc /libswscale/utils.c | |
| parent | d461e077a51c286264ed34b1a550c99311f30e8d (diff) | |
| parent | f25e6e0c255a6d81971fe66f6c32d29be0706f3d (diff) | |
Merge commit 'f25e6e0c255a6d81971fe66f6c32d29be0706f3d' into release/2.2
* commit 'f25e6e0c255a6d81971fe66f6c32d29be0706f3d':
RELEASE_NOTES: mention new filters
Conflicts:
doc/RELEASE_NOTES
Not merged as these things where in past ffmpeg releases already.
Or at least some of them where, volunteers to checks this and update
our release notes are welcome
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libswscale/utils.c')
0 files changed, 0 insertions, 0 deletions