diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-11 18:49:37 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-11 18:49:37 +0200 |
| commit | c11b3010c21a194a9e8da7f07c918ce1276e3d10 (patch) | |
| tree | 87dbd686d1d29edb3361cc22bbc8c5d624a4cf08 /libavfilter | |
| parent | 3301b248b0338ca53ad24ae77677bd733ed9d063 (diff) | |
| parent | 18f48e05a22a73a389fb3ab4b3eaf78903bab5ef (diff) | |
| download | ffmpeg-c11b3010c21a194a9e8da7f07c918ce1276e3d10.tar.gz | |
Merge commit '18f48e05a22a73a389fb3ab4b3eaf78903bab5ef' into release/2.2
* commit '18f48e05a22a73a389fb3ab4b3eaf78903bab5ef':
cdgraphics: do not return 0 from the decode function
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter')
0 files changed, 0 insertions, 0 deletions