[FFmpeg-cvslog] Merge commit '3f872c9bfa8ee1032058cfa48068b5a73ef27b5e'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jul  1 03:36:21 2015 +0200| [16dd0426e5681ff4ad0752f7fd1d27611e0cb05a] | committer: Michael Niedermayer

Merge commit '3f872c9bfa8ee1032058cfa48068b5a73ef27b5e'

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

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=16dd0426e5681ff4ad0752f7fd1d27611e0cb05a
---