[FFmpeg-cvslog] Merge commit '9f0617d2137bb7231b181d74392cd84ef4844cd7'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Nov 29 23:20:19 2013 +0100| [cdc21e4abe2a0e9394638bb09086ac2068f0683b] | committer: Michael Niedermayer

Merge commit '9f0617d2137bb7231b181d74392cd84ef4844cd7'

* commit '9f0617d2137bb7231b181d74392cd84ef4844cd7':
  mpeg4videodec: remove write-only sprite variables from MpegEncContext

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

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