[FFmpeg-cvslog] Merge commit '2db953f84671997e936f91140ffb5143c1537844'
Michael Niedermayer
git at videolan.org
Thu Jul 17 14:10:44 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jul 17 14:00:01 2014 +0200| [5fce29ef29e416d843a139e083ae9d3f7783132a] | committer: Michael Niedermayer
Merge commit '2db953f84671997e936f91140ffb5143c1537844'
* commit '2db953f84671997e936f91140ffb5143c1537844':
h264: K&R formatting cosmetics
Conflicts:
libavcodec/h264.c
libavcodec/h264_direct.c
libavcodec/h264_slice.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5fce29ef29e416d843a139e083ae9d3f7783132a
---
More information about the ffmpeg-cvslog
mailing list