Merge commit 'd456baafb68cd80c0f537f1d843076e4dd853558'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 19 Aug 2014 16:43:42 +0000 (18:43 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 19 Aug 2014 16:50:11 +0000 (18:50 +0200)
commit580e81fca5781291950774b18965cc7322f77cb2
tree398aa4126677aef21691a4c86cbffe6af0824abd
parentc18a3b3e8ef438c8cd18969f8d87fd7c2201cf32
parentd456baafb68cd80c0f537f1d843076e4dd853558
Merge commit 'd456baafb68cd80c0f537f1d843076e4dd853558'

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

Conflicts:
libavcodec/vc1dec.c

See: 1e2ab98460761c86268993e7a7ee690876df5efd
Merged-by: Michael Niedermayer <michaelni@gmx.at>