Merge commit '47e547b321338c73c21fa623789f1efbd80a297a'
authorClément Bœsch <u@pkh.me>
Mon, 17 Apr 2017 12:01:31 +0000 (14:01 +0200)
committerClément Bœsch <u@pkh.me>
Mon, 17 Apr 2017 12:01:57 +0000 (14:01 +0200)
commite22d495538c1de6a13cf8f51e7448d3312365747
treed0681e38c64f0e745125502d478d9cb898f18c22
parentb5a42c7f098a0eaee9cb08ce8b26b0c9a307d9c4
parent47e547b321338c73c21fa623789f1efbd80a297a
Merge commit '47e547b321338c73c21fa623789f1efbd80a297a'

* commit '47e547b321338c73c21fa623789f1efbd80a297a':
  lavc: add a null bitstream filter

Merged-by: Clément Bœsch <u@pkh.me>
doc/bitstream_filters.texi
libavcodec/Makefile
libavcodec/bitstream_filters.c
libavcodec/null_bsf.c