[FFmpeg-cvslog] Merge commit '7d99c92945e4b2d12ed2126365482e1900340da0'
Michael Niedermayer
git at videolan.org
Tue Jul 30 11:50:12 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jul 30 11:40:05 2013 +0200| [42f7c45d7b856839fa613c22645d5bff5352fc87] | committer: Michael Niedermayer
Merge commit '7d99c92945e4b2d12ed2126365482e1900340da0'
* commit '7d99c92945e4b2d12ed2126365482e1900340da0':
udp: Keep track of include and exclude sources separately
Conflicts:
libavformat/udp.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=42f7c45d7b856839fa613c22645d5bff5352fc87
---
More information about the ffmpeg-cvslog
mailing list