Merge commit '24b5cff01bbac4e08acfd6d19c499e880988f520'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sun, 26 Jun 2016 13:18:56 +0000 (15:18 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sun, 26 Jun 2016 13:20:43 +0000 (15:20 +0200)
commit2c1d0f871f6a3ee851f7094cc9946652ba1788ab
tree3ed831536315722b714b936450eb5ab63095ab2e
parentb20fe650ef856006b50bbd767a39e19a8a6319f8
parent24b5cff01bbac4e08acfd6d19c499e880988f520
Merge commit '24b5cff01bbac4e08acfd6d19c499e880988f520'

* commit '24b5cff01bbac4e08acfd6d19c499e880988f520':
  lavc: handle hw_frames_ctx where necessary

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
libavcodec/options.c