eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-23 07:20:05 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
ae48547a5296f7aa5518d934325aeaddbdad2cd5
ffmpeg/libavformat/udp.c
Michael Niedermayer 42f7c45d7b Merge commit '7d99c92945e4b2d12ed2126365482e1900340da0' 
* commit '7d99c92945e4b2d12ed2126365482e1900340da0':
  udp: Keep track of include and exclude sources separately

Conflicts:
	libavformat/udp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-30 11:40:05 +02:00

30 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink