[FFmpeg-cvslog] Merge commit 'bc75b64cff37d58f3944e2da3da45c37f35f019a'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Nov 25 11:00:50 2014 +0100| [0aa208837e247d0e031755e031202e567c5e82fb] | committer: Michael Niedermayer

Merge commit 'bc75b64cff37d58f3944e2da3da45c37f35f019a'

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

Conflicts:
	libavcodec/vc1_pred.c

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

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