[FFmpeg-cvslog] Merge commit '6516632967da5e6bd7d6136e8678f826669ed26e'
Michael Niedermayer
git at videolan.org
Sun Jul 7 11:34:58 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jul 7 11:26:28 2013 +0200| [7bd417c22a90a712df57cacfa5b09c1fb4f6183a] | committer: Michael Niedermayer
Merge commit '6516632967da5e6bd7d6136e8678f826669ed26e'
* commit '6516632967da5e6bd7d6136e8678f826669ed26e':
tests: Only run noproxy test if networking is enabled
fifo: K&R formatting cosmetics
Conflicts:
libavformat/Makefile
libavutil/fifo.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7bd417c22a90a712df57cacfa5b09c1fb4f6183a
---
More information about the ffmpeg-cvslog
mailing list