Merge commit 'f940c859c23ae201b0170cf541ea8f6b7a52dd49'

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

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

diff --cc libavcodec/vaapi_encode_h265.c
Simple merge