diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-10 01:36:39 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-10 01:37:08 +0100 |
| commit | 715ccc2bc47901e587939cf7b92667f343769b0a (patch) | |
| tree | 5923ae33ca240bc4be21a6742551881c0e7b254b /libavcodec/png_parser.c | |
| parent | d99653c9e444323841030b41e66accd5b36945e7 (diff) | |
| parent | 09f25533a564eab743f258d168697a11122914c4 (diff) | |
| download | ffmpeg-715ccc2bc47901e587939cf7b92667f343769b0a.tar.gz | |
Merge commit '09f25533a564eab743f258d168697a11122914c4'
* commit '09f25533a564eab743f258d168697a11122914c4':
v4l2: Preserve errno values
Conflicts:
libavdevice/v4l2.c
See: 60950adc18fe145a235211e75da68ab07123fcaa
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/png_parser.c')
0 files changed, 0 insertions, 0 deletions