ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Sat Oct 18
23:13:00 2014 +0200| [837605704dafdfe7df2a87fd3eac2a8458e3329c] | committer:
Michael Niedermayer
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 <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=837605704dafdfe7df2a87fd3eac2a8458e3329c
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
