[FFmpeg-cvslog] Merge commit 'd8fd183683b7495566b7e510a6536ae2efe8dfed'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Dec 18 12:23:41 2013 +0100| [09d6ceac4d10d72e937de89608c30efa86352553] | committer: Michael Niedermayer

Merge commit 'd8fd183683b7495566b7e510a6536ae2efe8dfed'

* commit 'd8fd183683b7495566b7e510a6536ae2efe8dfed':
  vc1: Fix mb_height for field pictures

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

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