Merge commit '3f872c9bfa8ee1032058cfa48068b5a73ef27b5e'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 1 Jul 2015 01:36:21 +0000 (03:36 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 1 Jul 2015 01:36:32 +0000 (03:36 +0200)
commit16dd0426e5681ff4ad0752f7fd1d27611e0cb05a
tree33d908e655761d82a10935f10705ddf9a42ad2f3
parent9e93e544dc2efa76bce51e59c2435414e38b0291
parent3f872c9bfa8ee1032058cfa48068b5a73ef27b5e
Merge commit '3f872c9bfa8ee1032058cfa48068b5a73ef27b5e'

* commit '3f872c9bfa8ee1032058cfa48068b5a73ef27b5e':
  lavc: Add missing API guard to dtg_active_format option

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/options_table.h