diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-11 18:40:48 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-11 18:41:07 +0200 |
| commit | 3301b248b0338ca53ad24ae77677bd733ed9d063 (patch) | |
| tree | da1291d01d550fb8238e5550dc6b616d752df5a8 /libavfilter | |
| parent | 7b67ce9ade01abcf0d5d08ada62011b43526a646 (diff) | |
| parent | 5bf5a35fb5d452ea4b30cd7b853d92df6705d250 (diff) | |
| download | ffmpeg-3301b248b0338ca53ad24ae77677bd733ed9d063.tar.gz | |
Merge commit '5bf5a35fb5d452ea4b30cd7b853d92df6705d250' into release/2.2
* commit '5bf5a35fb5d452ea4b30cd7b853d92df6705d250':
cdgraphics: switch to bytestream2
Conflicts:
libavcodec/cdgraphics.c
See: ad002e1a13a8df934bd6cb2c84175a4780ab8942
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter')
0 files changed, 0 insertions, 0 deletions