[FFmpeg-cvslog] Merge commit 'c2597c5a0a08526493abb9bc9544b61a290fe20f'

Michael Niedermayer git at videolan.org
Wed Mar 13 13:33:10 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Mar 13 13:28:29 2013 +0100| [87d263a122f6212c236531f8586598605ecab87c] | committer: Michael Niedermayer

Merge commit 'c2597c5a0a08526493abb9bc9544b61a290fe20f'

* commit 'c2597c5a0a08526493abb9bc9544b61a290fe20f':
  h264_refs: cosmetics, reformat

Conflicts:
	libavcodec/h264_refs.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=87d263a122f6212c236531f8586598605ecab87c
---





More information about the ffmpeg-cvslog mailing list