[FFmpeg-cvslog] Merge commit '051ac5c0f51c119b33a57f3e137d7344eb1c2b26' into release/2.2

[Michael Niedermayer]

ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Sat Sep 20 14:25:36 2014 +0200| [58b5b062b84b09dfa49bf84497eb530da3918abf] | committer: Michael Niedermayer

Merge commit '051ac5c0f51c119b33a57f3e137d7344eb1c2b26' into release/2.2

* commit '051ac5c0f51c119b33a57f3e137d7344eb1c2b26':
  mpegvideo: Use the current_picture pts

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

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