Merge commit '89b35a139e838deeb32ec20d8d034c81014401d0'
authorJames Almer <jamrial@gmail.com>
Thu, 23 Mar 2017 19:31:15 +0000 (16:31 -0300)
committerJames Almer <jamrial@gmail.com>
Thu, 23 Mar 2017 19:31:15 +0000 (16:31 -0300)
commit7ebc9f8df4035ecaa84ad4429480986e3e7597ae
tree7e97f2f4f4e95dc0b4b2f4fcb433cfed016acb19
parent4a5810b6592db74b9c345ea74c4f08f5f490874c
parent89b35a139e838deeb32ec20d8d034c81014401d0
Merge commit '89b35a139e838deeb32ec20d8d034c81014401d0'

* commit '89b35a139e838deeb32ec20d8d034c81014401d0':
  lavc: add a bitstream filter for extracting extradata from packets

Merged-by: James Almer <jamrial@gmail.com>
doc/bitstream_filters.texi
libavcodec/Makefile
libavcodec/bitstream_filters.c
libavcodec/extract_extradata_bsf.c
libavcodec/version.h