diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-30 20:54:08 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-30 20:55:52 +0200 |
| commit | 847c0d333b6a195670f5bd64e9f7e5c9cf254cc4 (patch) | |
| tree | 3ad247f5591a06a9967b362b7dcd0d3e6e7dc6e6 /libavfilter/vf_drawbox.c | |
| parent | 98263d751562e3b8cefa6d06eb95f0dee8a205db (diff) | |
| parent | 6ed38b1f65b424a4fa92042e0069f350b95e0098 (diff) | |
| download | ffmpeg-847c0d333b6a195670f5bd64e9f7e5c9cf254cc4.tar.gz | |
Merge commit '6ed38b1f65b424a4fa92042e0069f350b95e0098'
* commit '6ed38b1f65b424a4fa92042e0069f350b95e0098':
tiff: Return more meaningful error codes
Conflicts:
libavcodec/tiffenc.c
See: 0187c2ccda3b00d22797170bf5675318dd0f675a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_drawbox.c')
0 files changed, 0 insertions, 0 deletions