Merge commit '75872d77d215d64b8d9430df23c6c74ff921227b'
authorClément Bœsch <u@pkh.me>
Sat, 9 Jul 2016 12:55:39 +0000 (14:55 +0200)
committerClément Bœsch <u@pkh.me>
Sat, 9 Jul 2016 12:55:39 +0000 (14:55 +0200)
commit46bd0e8e0dfb4b295e8fbe6854904eccb0cb5c82
tree5da15ba36a7c16cd8b07bed32faa08bbed773d6f
parent84ecbbfb27272dc8e45aa19f1149cc4996bb505c
parent75872d77d215d64b8d9430df23c6c74ff921227b
Merge commit '75872d77d215d64b8d9430df23c6c74ff921227b'

* commit '75872d77d215d64b8d9430df23c6c74ff921227b':
  lavc: Document AV_PKT_DATA_NEW_EXTRADATA

Merged-by: Clément Bœsch <u@pkh.me>
libavcodec/avcodec.h