Merge commit 'bc75b64cff37d58f3944e2da3da45c37f35f019a'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 25 Nov 2014 10:00:50 +0000 (11:00 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 25 Nov 2014 10:05:15 +0000 (11:05 +0100)
commit0aa208837e247d0e031755e031202e567c5e82fb
treec3b8d2c3efa8525e55bdcb28d2731476abfd4720
parent1f3d4788983d929d76e1d168bec7db1c80a50be5
parentbc75b64cff37d58f3944e2da3da45c37f35f019a
Merge commit 'bc75b64cff37d58f3944e2da3da45c37f35f019a'

* commit 'bc75b64cff37d58f3944e2da3da45c37f35f019a':
  vc1pred: remove logically dead code

Conflicts:
libavcodec/vc1_pred.c

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