Merge commit '84adab333cddeefc3cfd843089dee23f58bd372c'
authorHendrik Leppkes <h.leppkes@gmail.com>
Thu, 17 Dec 2015 12:18:18 +0000 (13:18 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Thu, 17 Dec 2015 12:18:18 +0000 (13:18 +0100)
commita7d5b9f1c3ca2e63b0eb882eabadfa1461d17a2d
tree5e6a5a5085c0540c54263911843114c44c42fc98
parent30833d121e24fc644c9c4e6ca07df3e9e4963180
parent84adab333cddeefc3cfd843089dee23f58bd372c
Merge commit '84adab333cddeefc3cfd843089dee23f58bd372c'

* commit '84adab333cddeefc3cfd843089dee23f58bd372c':
  lavc: add stream-global packet side data

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