diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-09 12:40:22 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-09 12:40:22 +0100 |
| commit | 895ddf1a80f28a3d81b016e4bc8bd10b519d4f26 (patch) | |
| tree | ea34e926fc796ce29ac022cf12119c568e01a221 /libavfilter/buffersrc.c | |
| parent | e48f2847aba795ac62dcc2aea7c176eb2833c168 (diff) | |
| parent | 470fd8e64e292d2336b2b860437dcbc053ba9eec (diff) | |
| download | ffmpeg-895ddf1a80f28a3d81b016e4bc8bd10b519d4f26.tar.gz | |
Merge commit '470fd8e64e292d2336b2b860437dcbc053ba9eec' into release/2.2
* commit '470fd8e64e292d2336b2b860437dcbc053ba9eec':
Update Changelog for v10.6
Conflicts:
Changelog
not merged
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/buffersrc.c')
0 files changed, 0 insertions, 0 deletions