[FFmpeg-cvslog] Merge commit 'c6b42e85493915a3c3891345f57422f9031a0b4f'
Michael Niedermayer
git at videolan.org
Sat May 3 23:22:26 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat May 3 23:15:37 2014 +0200| [3ea5beab8f7352c94f71148ab98dd247412129a3] | committer: Michael Niedermayer
Merge commit 'c6b42e85493915a3c3891345f57422f9031a0b4f'
* commit 'c6b42e85493915a3c3891345f57422f9031a0b4f':
flv: K&R formatting cosmetics
Conflicts:
libavcodec/flvdec.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3ea5beab8f7352c94f71148ab98dd247412129a3
---
More information about the ffmpeg-cvslog
mailing list