Merge commit '37045e422903695e610cca6ecb753df643ab9380'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 12 Mar 2013 11:57:54 +0000 (12:57 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 12 Mar 2013 11:57:54 +0000 (12:57 +0100)
* 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>
1  2 
libavcodec/mpegvideo.c
libavcodec/mpegvideo.h

Simple merge
Simple merge