Merge commit '6f1960ab71b4f18551243ce22d01913108265233'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 8 Aug 2014 19:53:20 +0000 (21:53 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 8 Aug 2014 19:53:20 +0000 (21:53 +0200)
commit5ff2b33401ec0ac6a238d02e56100b7bce8afefe
tree37a98751e994f14b5588ca66dfd4d85db0b15028
parenteb2def0ff2c40033e871e7be8a37a53cd4ac45b8
parent6f1960ab71b4f18551243ce22d01913108265233
Merge commit '6f1960ab71b4f18551243ce22d01913108265233'

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

Conflicts:
libavcodec/idctdsp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/idctdsp.c