Merge commit '31c51f7441de07b88cfea2550245bf1f5140cb8f'
authorHendrik Leppkes <h.leppkes@gmail.com>
Thu, 17 Dec 2015 12:12:07 +0000 (13:12 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Thu, 17 Dec 2015 12:12:07 +0000 (13:12 +0100)
commit30833d121e24fc644c9c4e6ca07df3e9e4963180
treedb5e1913911cfaa1366f9bcf9efd2371b06f492e
parent10e55bd658b06034d700553190b419b1af92b7cb
parent31c51f7441de07b88cfea2550245bf1f5140cb8f
Merge commit '31c51f7441de07b88cfea2550245bf1f5140cb8f'

* commit '31c51f7441de07b88cfea2550245bf1f5140cb8f':
  avpacket: add a function for wrapping existing data as side data

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
doc/APIchanges
libavcodec/avcodec.h
libavcodec/avpacket.c
libavcodec/version.h