[FFmpeg-cvslog] Merge commit 'f6f32fc93d39caf329869c1bff8ad024ccab1d42'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Thu Oct 22 15:48:11 2015 +0200| [2fece1e4d5ee180576617eeb41ba4615c2e97729] | committer: Hendrik Leppkes

Merge commit 'f6f32fc93d39caf329869c1bff8ad024ccab1d42'

* commit 'f6f32fc93d39caf329869c1bff8ad024ccab1d42':
  qsvenc: set the timestamp for PIX_FMT_QSV frames as well

Merged-by: Hendrik Leppkes <h.leppkes at gmail.com>

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