ffmpeg | branch: master | Michael Niedermayer <[email protected]> | 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 <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c8be5258dec928119fab414341b13c0cf5405294
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
