Merge commit '6d5a6dde5301c81e221a37b3f39bb03149492b98'
authorMark Thompson <sw@jkqxz.net>
Wed, 21 Feb 2018 22:54:07 +0000 (22:54 +0000)
committerMark Thompson <sw@jkqxz.net>
Wed, 21 Feb 2018 22:54:07 +0000 (22:54 +0000)
commitecb3d6edc3b756cc1d40b1073f244b581ef5bcfb
tree5049e4fee41101a5e3f0cc38e5e1efa427d3eb81
parentfbeac5356c692b6f681a21749dee3a3e414f1230
parent6d5a6dde5301c81e221a37b3f39bb03149492b98
Merge commit '6d5a6dde5301c81e221a37b3f39bb03149492b98'

* commit '6d5a6dde5301c81e221a37b3f39bb03149492b98':
  h264_metadata: Add option to delete filler data

Fixes #6899.

Merged-by: Mark Thompson <sw@jkqxz.net>
libavcodec/h264_metadata_bsf.c