diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-19 01:13:00 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-19 01:22:33 +0400 |
| commit | 837605704dafdfe7df2a87fd3eac2a8458e3329c (patch) | |
| tree | ce516cbc78bcf17016dcb6247c93afd23a4294a1 /libswscale/rgb2rgb_template.c | |
| parent | 85cf049d5092cbcb8f81defeb8dcdb1f9a21ecf1 (diff) | |
| parent | b7c77912b62163b3b46ce93fe42fff3c83604c82 (diff) | |
Merge commit 'b7c77912b62163b3b46ce93fe42fff3c83604c82'
* commit 'b7c77912b62163b3b46ce93fe42fff3c83604c82':
oss_audio: use a macro to simplify ioctl() error checking
Conflicts:
libavdevice/oss_audio.c
See: 69c7aad494683953e833e8622776e3bbcc7921ed
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/rgb2rgb_template.c')
0 files changed, 0 insertions, 0 deletions