diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-27 11:10:26 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-27 11:10:26 +0100 |
| commit | 097de4d1d68fb5aef5fc8881b2afc65db3f0dac0 (patch) | |
| tree | dc90f37eeb1d3843fddb2c0eb4c73a46c4a19046 /libavcodec | |
| parent | 9f9440bd8122cc8798139c9370db0873a24ae14b (diff) | |
| parent | 9326d64ed1baadd7af60df6bbcc59cf1fefede48 (diff) | |
| download | ffmpeg-097de4d1d68fb5aef5fc8881b2afc65db3f0dac0.tar.gz | |
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>
Diffstat (limited to 'libavcodec')
0 files changed, 0 insertions, 0 deletions