[FFmpeg-cvslog] Merge commit 'b1aacd56685cd131f517e0551834a0bbd3f5f809'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Nov 30 03:20:05 2013 +0100| [0cea39fdd310caaec96f5fe985fe7fcf8dcf38da] | committer: Michael Niedermayer

Merge commit 'b1aacd56685cd131f517e0551834a0bbd3f5f809'

* commit 'b1aacd56685cd131f517e0551834a0bbd3f5f809':
  mpeg4videodec: move t_frame from MpegEncContext to Mpeg4DecContext

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

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