ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Wed Oct 29
21:41:59 2014 +0100| [265c4771cc764372104ba8f6abfdde9239f4c0ad] | committer:
Michael Niedermayer
Merge commit '043ea6f7bfc59399b6b3659da785ec4cc68a008e'
* commit '043ea6f7bfc59399b6b3659da785ec4cc68a008e':
fbdev: Use av_strerror
Conflicts:
libavdevice/fbdev_dec.c
See: f6b56b1f26a1e40a47d85d24b42cd5475cd3b04f
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=265c4771cc764372104ba8f6abfdde9239f4c0ad
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
