Merge commit 'deefca02c275ce4bc5ccbee690463ffef81a18b8'
authorJames Almer <jamrial@gmail.com>
Thu, 29 Mar 2018 23:34:43 +0000 (20:34 -0300)
committerJames Almer <jamrial@gmail.com>
Thu, 29 Mar 2018 23:34:43 +0000 (20:34 -0300)
commitb065c71e9d2ad3c5d65f924a4003e3a7ee595417
treefde3d285e010230bbd2d147802bebfdad70776c6
parent20608261f7818fc034f96034a089e755f095716e
parentdeefca02c275ce4bc5ccbee690463ffef81a18b8
Merge commit 'deefca02c275ce4bc5ccbee690463ffef81a18b8'

* commit 'deefca02c275ce4bc5ccbee690463ffef81a18b8':
  qsvenc: add the Access Unit Delimiter NAL Unit support

Merged-by: James Almer <jamrial@gmail.com>
libavcodec/qsvenc.c
libavcodec/qsvenc.h
libavcodec/qsvenc_h264.c