Merge commit '187d719760bd130f848194ec4a6bd476341914bb'
authorClément Bœsch <u@pkh.me>
Sat, 9 Jul 2016 13:03:27 +0000 (15:03 +0200)
committerClément Bœsch <u@pkh.me>
Sat, 9 Jul 2016 13:03:27 +0000 (15:03 +0200)
commitc67aa7f287e791b2c02c0c6471336c8adc88020e
tree90c07bb51950e2136f09572668102fc8e6cac013
parent46bd0e8e0dfb4b295e8fbe6854904eccb0cb5c82
parent187d719760bd130f848194ec4a6bd476341914bb
Merge commit '187d719760bd130f848194ec4a6bd476341914bb'

* commit '187d719760bd130f848194ec4a6bd476341914bb':
  h264: Support AV_PKT_DATA_NEW_EXTRADATA

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