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)
* commit '6d5a6dde5301c81e221a37b3f39bb03149492b98':
  h264_metadata: Add option to delete filler data

Fixes #6899.

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

Simple merge