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)
* commit '3f872c9bfa8ee1032058cfa48068b5a73ef27b5e':
  lavc: Add missing API guard to dtg_active_format option

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

Simple merge