diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-08 21:35:40 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-08 21:35:40 +0200 |
| commit | 911ba8fb197dee6fb1dd4ac2d1fa2d8541ab6ab5 (patch) | |
| tree | b705257eab737a868ee064e95bd97d51e13785d3 /libavformat/version.h | |
| parent | be695ee389724d713e1b8a61ef899fe1795193ce (diff) | |
| parent | b15b06ebf582ae81e47d236524c9ad6e10c8a0a7 (diff) | |
Merge commit 'b15b06ebf582ae81e47d236524c9ad6e10c8a0a7'
* commit 'b15b06ebf582ae81e47d236524c9ad6e10c8a0a7':
avformat: use const char* instead of uint8_t* for AVProbeData.mime_type
Conflicts:
libavformat/format.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/version.h')
0 files changed, 0 insertions, 0 deletions