[FFmpeg-cvslog] Merge commit '1c7b71a5bdb88ebb69734100405bbb5441b871e8'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Apr 21 23:54:53 2014 +0200| [5e5aced585b30ca97a2fc0d03fce1c721d114864] | committer: Michael Niedermayer

Merge commit '1c7b71a5bdb88ebb69734100405bbb5441b871e8'

* commit '1c7b71a5bdb88ebb69734100405bbb5441b871e8':
  mpegvideo: Use the current_picture pts

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

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