highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
ae7a4a1594e3624f7c844dec44266d2dc74a6be2
ffmpeg/libavformat/4xm.c
Michael Niedermayer 0fecf2642b Merge remote-tracking branch 'newdev/master' 
Conflicts:
	Changelog
	doc/APIchanges
	doc/optimization.txt
	libavformat/avio.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-03-17 17:22:52 +01:00

11 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink