Michael Niedermayer ef4e54e0df 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@gmx.at>

2014-11-13 13:23:42 +01:00

36 KiB

Raw Blame History

View Raw