[FFmpeg-cvslog] Merge commit 'b9129ec4668c511e0a79e25c6f25d748cee172c9'

Sat Nov 11 00:46:09 EET 2017

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Fri Nov 10 19:43:46 2017 -0300| [ae644cee1f421af1abe36e16c07dae3ac4c406ba] | committer: James Almer

Merge commit 'b9129ec4668c511e0a79e25c6f25d748cee172c9'

* commit 'b9129ec4668c511e0a79e25c6f25d748cee172c9':
  h264dec: add a CUVID hwaccel
  decode: add a per-frame private data for hwaccel use
  decode: add a mechanism for performing delayed processing on the decoded frames
  decode: add a method for attaching lavc-internal data to frames
  decode: avoid leaks on failure in ff_get_buffer()

This commit is a noop, see
4776c61424fa32394e251e9769e1ad2c2fa55598
9f1cfd88af88a7d7d5c56a368a46639dfdfdef75
7fa64514c8d2ec4d3dcb5f194511609ddcc288e6
81c021c6a2d7848c31984d65f225ba54bdd6f560
0e00624389955bc559d75855d5c4876266d9575f

Merged-by: James Almer <jamrial at gmail.com>

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