Merge commit '37045e422903695e610cca6ecb753df643ab9380'

* commit '37045e422903695e610cca6ecb753df643ab9380':
  mpegvideo: drop vismv code

Conflicts:
	libavcodec/mpegvideo.c

vismv code works fine, and thus only the unused fields are droped

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

diff --cc libavcodec/mpegvideo.c
Simple merge

diff --cc libavcodec/mpegvideo.h
Simple merge