sysutils/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-11-11 12:02:22 +03:00
Code Activity
Files
7652b176fcb36fe1fc5b052d30696a829012dd29
ffmpeg/libavformat/format.c
Michael Niedermayer 911ba8fb19 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>
2014-10-08 21:35:40 +02:00

10 KiB
Raw Blame History

View Raw
View Git Blame Copy Permalink