Merge commit '8e2ea691351c5079cdab245ff7bfa5c0f3e3bfe4'
authorJames Almer <jamrial@gmail.com>
Thu, 23 Mar 2017 19:52:42 +0000 (16:52 -0300)
committerJames Almer <jamrial@gmail.com>
Thu, 23 Mar 2017 19:52:42 +0000 (16:52 -0300)
commit1c193ac1f9cfe703d6a1c36795f309ba5d14bf6e
tree81c545f9b9c53ebc4fbadd14a1cd4afc5099e659
parent7ebc9f8df4035ecaa84ad4429480986e3e7597ae
parent8e2ea691351c5079cdab245ff7bfa5c0f3e3bfe4
Merge commit '8e2ea691351c5079cdab245ff7bfa5c0f3e3bfe4'

* commit '8e2ea691351c5079cdab245ff7bfa5c0f3e3bfe4':
  lavf: use the new bitstream filter for extracting extradata

Merged-by: James Almer <jamrial@gmail.com>
libavformat/internal.h
libavformat/utils.c