eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-16 03:50:05 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
a68b6ec7f55ec9a35848fb70ca6edfded174bbb3
ffmpeg/libavformat/unix.c
Michael Niedermayer 89efaabc99 Merge commit 'abe5268c3328bf0e8fcfb7dc6e231b8920177c3a' 
* commit 'abe5268c3328bf0e8fcfb7dc6e231b8920177c3a':
  tcp: Use a different log message and level if there's more addresses to try

Conflicts:
	libavformat/tcp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-06 17:53:01 +02:00

4.6 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink