[FFmpeg-cvslog] Merge commit '01f251c44d83eedc819625d2caac9ff9697a085d'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Dec 18 20:22:01 2014 +0100| [c0586b257d9c451747d00ce0d1c5bbdcbe9f4ec5] | committer: Michael Niedermayer

Merge commit '01f251c44d83eedc819625d2caac9ff9697a085d'

* commit '01f251c44d83eedc819625d2caac9ff9697a085d':
  rtpenc: Set the timestamp properly when sending mpegts data, too

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

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