[FFmpeg-cvslog] Merge commit '53151723e377b9c43f876e20d7f27a17993256c8'
Michael Niedermayer
git at videolan.org
Mon Oct 28 12:25:17 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Oct 28 12:17:57 2013 +0100| [0436ffc294bab3038268db9f6ad32b3a35fcdc65] | committer: Michael Niedermayer
Merge commit '53151723e377b9c43f876e20d7f27a17993256c8'
* commit '53151723e377b9c43f876e20d7f27a17993256c8':
avio: K&R formatting cosmetics
Conflicts:
libavformat/avio.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0436ffc294bab3038268db9f6ad32b3a35fcdc65
---
More information about the ffmpeg-cvslog
mailing list