Merge commit '58170b027144f4840018c7a60fb8d07924cc6242'
authorHendrik Leppkes <h.leppkes@gmail.com>
Mon, 4 Jan 2016 10:32:11 +0000 (11:32 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Mon, 4 Jan 2016 10:32:11 +0000 (11:32 +0100)
commit3e337f0e40145d586de34f634818285483ea18a0
treed94773021e175411bbd312651ad9ef67874d458c
parent9507f68deb664c19aceddcf1451f7237aae919c3
parent58170b027144f4840018c7a60fb8d07924cc6242
Merge commit '58170b027144f4840018c7a60fb8d07924cc6242'

* commit '58170b027144f4840018c7a60fb8d07924cc6242':
  lavc: Add missing #includes for ff_dlog()

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