diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-04 05:08:01 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-04 05:29:55 +0200 |
| commit | 2793b218bdd59db51f1f5c960c508fea7190310e (patch) | |
| tree | 1f71ca2c450d848ce588fe240e4d432231d73c92 /libavfilter/vf_showinfo.c | |
| parent | d5fde13bd226574714d7e30e6442b27f782017a6 (diff) | |
| parent | d0393d79bc3d61c9f2ff832c0e273b7774ff0269 (diff) | |
| download | ffmpeg-2793b218bdd59db51f1f5c960c508fea7190310e.tar.gz | |
Merge commit 'd0393d79bc3d61c9f2ff832c0e273b7774ff0269'
* commit 'd0393d79bc3d61c9f2ff832c0e273b7774ff0269':
huffyuv: Check and propagate function return values
Conflicts:
libavcodec/huffyuvdec.c
See: f67a0d115254461649470452058fa3c28c0df294
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_showinfo.c')
0 files changed, 0 insertions, 0 deletions