Merge commit '97c9a5084479eeb66f4beb100cc7589a2c8bfe81'
authorJames Almer <jamrial@gmail.com>
Wed, 20 Feb 2019 16:48:09 +0000 (13:48 -0300)
committerJames Almer <jamrial@gmail.com>
Wed, 20 Feb 2019 16:48:09 +0000 (13:48 -0300)
* commit '97c9a5084479eeb66f4beb100cc7589a2c8bfe81':
  avcodec/libaomenc: remove AVOption related to frame partitions
  avcodec/extract_extradata: don't uninitialize the H2645Packet on every processed packet
  avcodec/extract_extradata: Move the reference in the bsf internal buffer
  avcodec/extract_extradata: Do not allocate more space than needed when removing NALUs in h264/hevc
  avcodec/extract_extradata: Zero-initialize the padding bytes in all allocated buffers
  avcodec/extract_extradata_bsf: Fix leak discovered via fuzzing
  avcodec/bsf: Add ff_bsf_get_packet_ref() function

This commit is a noop, see

7ae52f8a6b4a137f79b032b7094b3d5867839d52
5a412a5c3cc216ae1d15e6b884bda7214b73a5b0
d168e78effd170377ec57f67bca05c9f0de91bca
2536bd863246218631ab27144d8a3be45036445a
9c6dd9d6248897a2d8dd4ede948c166e5a579a4b
016d40011ac2815157fc11f6dda2f9bfb520ecfe
b69ea742ab23ad74b2ae2772764743642212a139

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

Trivial merge