Commit 5ff2b334 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '6f1960ab'

* commit '6f1960ab':
  idct: cosmetics: Drop one unnecessary if-block level

Conflicts:
	libavcodec/idctdsp.c
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents eb2def0f 6f1960ab
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