[FFmpeg-cvslog] Merge commit '28d82b7675bea76a1349070a3cdd737d964d4775'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Nov 13 13:22:02 2014 +0100| [ef4e54e0df444142b7c975340df7ac478a598d20] | committer: Michael Niedermayer

Merge commit '28d82b7675bea76a1349070a3cdd737d964d4775'

* commit '28d82b7675bea76a1349070a3cdd737d964d4775':
  vc1dec: refactor check with missing parenthesis

Conflicts:
	libavcodec/vc1_mc.c
	tests/ref/fate/vc1_ilaced_twomv

Theres no change to the reference checksums as this bug was not
in FFmpeg

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ef4e54e0df444142b7c975340df7ac478a598d20
---