Merge commit '79f5347a983342e2711ca8ba19ec3d8d151183f0'
authorHendrik Leppkes <h.leppkes@gmail.com>
Wed, 11 Nov 2015 13:41:49 +0000 (14:41 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Wed, 11 Nov 2015 13:41:49 +0000 (14:41 +0100)
commitb33d58c31f210d6409a54f3adb6e9a3d0c1642f6
tree1f09c04031eab1762e89aad382503306e37e0e3f
parent611c22140a54db0baa863b26368e12d3a1d8267e
parent79f5347a983342e2711ca8ba19ec3d8d151183f0
Merge commit '79f5347a983342e2711ca8ba19ec3d8d151183f0'

* commit '79f5347a983342e2711ca8ba19ec3d8d151183f0':
  avcodec: fix doxy placement

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