[FFmpeg-cvslog] Merge commit '2992afda83a7d5c0a9ec45bdce76d8abbe0961c5'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Nov 30 04:02:11 2013 +0100| [aeead427896a632c09c13c2b90ba096bf8678ef1] | committer: Michael Niedermayer

Merge commit '2992afda83a7d5c0a9ec45bdce76d8abbe0961c5'

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

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

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