Commit 87d263a1 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'c2597c5a'

* commit 'c2597c5a':
  h264_refs: cosmetics, reformat

Conflicts:
	libavcodec/h264_refs.c
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 6c3e4e39 c2597c5a
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment