Commit 2d4b8af4 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'b82722df'

* commit 'b82722df':
  hevc: reindent after previous commit

Conflicts:
	libavcodec/hevc.c

See: f8ecffa9Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 4e40e612 b82722df
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