Commit 580e81fc authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'd456baaf'

* commit 'd456baaf':
  vc1: Add missing parentheses to conditions in vc1_decode_b_mb_intfr()

Conflicts:
	libavcodec/vc1dec.c

See: 1e2ab984Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents c18a3b3e d456baaf
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