[FFmpeg-cvslog] Merge commit 'ff4d1aa8bc3f4fe9d1f684f760b29c51adb569ef'
Michael Niedermayer
git at videolan.org
Tue Sep 2 22:17:00 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Sep 2 22:07:06 2014 +0200| [c8be5258dec928119fab414341b13c0cf5405294] | committer: Michael Niedermayer
Merge commit 'ff4d1aa8bc3f4fe9d1f684f760b29c51adb569ef'
* commit 'ff4d1aa8bc3f4fe9d1f684f760b29c51adb569ef':
flv: K&R formatting cosmetics
Conflicts:
libavcodec/flv.h
libavcodec/flvdec.c
libavcodec/flvenc.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c8be5258dec928119fab414341b13c0cf5405294
---
More information about the ffmpeg-cvslog
mailing list