Commit f02033b9 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'f713411d'

* commit 'f713411d':
  mdec: cosmetics, reformat

Conflicts:
	libavcodec/mdec.c
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 14aa358c f713411d
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