[FFmpeg-cvslog] Merge commit 'b776113e5d4a56759615196de98efe802e95a6b6'
Michael Niedermayer
git at videolan.org
Tue Nov 11 10:41:30 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Nov 11 10:26:28 2014 +0100| [a83af3fc33a6d858138c5ff772a01b220782eb95] | committer: Michael Niedermayer
Merge commit 'b776113e5d4a56759615196de98efe802e95a6b6'
* commit 'b776113e5d4a56759615196de98efe802e95a6b6':
v4l2: Unify one instance of reading/storing errno
Conflicts:
libavdevice/v4l2.c
See: 60950adc18fe145a235211e75da68ab07123fcaa
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a83af3fc33a6d858138c5ff772a01b220782eb95
---
More information about the ffmpeg-cvslog
mailing list