ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Mon Feb 16 02:56:17 2015 +0100| [e97a9666ef4511cc34637dc7b064b0a6a4565d0f] | committer: Michael Niedermayer
Merge commit '81ef46020fa654720e3beb4f5551ba634fae262a' * commit '81ef46020fa654720e3beb4f5551ba634fae262a': bktr: Use av_strerror and propagate error codes Conflicts: libavdevice/bktr.c Merged-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e97a9666ef4511cc34637dc7b064b0a6a4565d0f --- _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog