Merge commit '4272bb6ef1533846a788c259cc498562d0704444'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 6 Oct 2013 09:15:40 +0000 (11:15 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 6 Oct 2013 09:16:15 +0000 (11:16 +0200)
commit90cecd3c9b6bf4a18f9b3f19fa5e3e2f7c1e24d9
treecff446d6ed67adc2874158e429e95bb9a33164c5
parent931a4b433dcec3b8e58fe1ae59883e871cd32eaf
parent4272bb6ef1533846a788c259cc498562d0704444
Merge commit '4272bb6ef1533846a788c259cc498562d0704444'

* commit '4272bb6ef1533846a788c259cc498562d0704444':
  doxy: Document avlog

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavutil/avutil.h
libavutil/log.h