diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-21 13:53:11 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-21 13:54:28 +0200 |
commit | c05dbb8744f55823ba1ae2bca774b068bb55dc12 (patch) | |
tree | 3cf816e6086514f2955ae9bdbfd3e0a461516e6d /libavfilter/vf_blackdetect.c | |
parent | d986c414dea14cef41d83f74b9549202c2efe6be (diff) | |
parent | c3ec963d0d0fac2d817f7fbce2e89ed46eeba550 (diff) | |
download | ffmpeg-c05dbb8744f55823ba1ae2bca774b068bb55dc12.tar.gz |
Merge commit 'c3ec963d0d0fac2d817f7fbce2e89ed46eeba550'
* commit 'c3ec963d0d0fac2d817f7fbce2e89ed46eeba550':
mjpeg: return proper error code
See: 2ebaadf35c9387610ca1eb7e94c171050562a77c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_blackdetect.c')
0 files changed, 0 insertions, 0 deletions