eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-22 23:10:00 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
133055c5e47b047b0806ccdeb42b82e418bd5dfa
ffmpeg/libavformat/msnwc_tcp.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

3.9 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink