Merge commit 'f940c859c23ae201b0170cf541ea8f6b7a52dd49'
authorJames Almer <jamrial@gmail.com>
Sat, 11 Nov 2017 17:07:09 +0000 (14:07 -0300)
committerJames Almer <jamrial@gmail.com>
Sat, 11 Nov 2017 17:07:09 +0000 (14:07 -0300)
commitf1fdd17d39598a01dd19bf7202de5ef8f06ddcb0
tree57b57a2c0cd6b173ab5aff498d0fa0b0cf406135
parente493ede4ae9a64afca54102a3c9b7fd0697e3e58
parentf940c859c23ae201b0170cf541ea8f6b7a52dd49
Merge commit 'f940c859c23ae201b0170cf541ea8f6b7a52dd49'

* commit 'f940c859c23ae201b0170cf541ea8f6b7a52dd49':
  Revert "vaapi_h265: Reduce the amount of padding in the stream"

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