[FFmpeg-cvslog] Merge commit 'e89247debd5276d57ce4a26516224204f9541af0'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Nov 30 03:46:49 2013 +0100| [47e5eaf8c9869e8e34e96252b8eeaabec7bcc894] | committer: Michael Niedermayer

Merge commit 'e89247debd5276d57ce4a26516224204f9541af0'

* commit 'e89247debd5276d57ce4a26516224204f9541af0':
  mpeg4videodec: replace MpegEncContext.reduced_res_vop with a local variable

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

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