ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Thu Nov 27
11:10:26 2014 +0100| [097de4d1d68fb5aef5fc8881b2afc65db3f0dac0] | committer:
Michael Niedermayer
Merge commit '9326d64ed1baadd7af60df6bbcc59cf1fefede48'
* commit '9326d64ed1baadd7af60df6bbcc59cf1fefede48':
Share the utf8 to wchar conversion routine between lavf and lavu
Conflicts:
libavformat/os_support.h
libavutil/file_open.c
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=097de4d1d68fb5aef5fc8881b2afc65db3f0dac0
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
