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)
commit3c1326411d6ffd2f30c0d6e8cc32d34b5ed5a518
tree5f6ed62d87937c9637758deddb16867b9c0b9966
parenta303dce28c9b3e7d532334907dd6cdca8fd6042c
parent37045e422903695e610cca6ecb753df643ab9380
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>
libavcodec/mpegvideo.c
libavcodec/mpegvideo.h