highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
cc48409b51c8cd8fed8038c00ea8b4a6b2341004
ffmpeg/libavutil/file_open.c
Michael Niedermayer 097de4d1d6 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 <michaelni@gmx.at>
2014-11-27 11:10:26 +01:00

2.9 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink