Merge commit '2992afda83a7d5c0a9ec45bdce76d8abbe0961c5'

* commit '2992afda83a7d5c0a9ec45bdce76d8abbe0961c5':
  mpeg4videodec: remove a write-only variable from MpegEncContext

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

diff --cc libavcodec/mpeg4videodec.c
Simple merge

diff --cc libavcodec/mpegvideo.h
Simple merge