diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-09 12:38:44 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-09 12:38:44 +0100 |
| commit | e48f2847aba795ac62dcc2aea7c176eb2833c168 (patch) | |
| tree | ea34e926fc796ce29ac022cf12119c568e01a221 /libavfilter/vf_mergeplanes.c | |
| parent | 71c63e799f3aedeab00538714caf7c7023b3ca2b (diff) | |
| parent | f74f4a540151aacb38306f2e41a160c326be3d51 (diff) | |
| download | ffmpeg-e48f2847aba795ac62dcc2aea7c176eb2833c168.tar.gz | |
Merge commit 'f74f4a540151aacb38306f2e41a160c326be3d51' into release/2.2
* commit 'f74f4a540151aacb38306f2e41a160c326be3d51':
Prepare for 10.6 Release
Conflicts:
RELEASE
Not merged
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_mergeplanes.c')
0 files changed, 0 insertions, 0 deletions