Merge commit '37c46743ee42df1d6986ba3c996e3af5b95511f7'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 1 Sep 2014 02:19:08 +0000 (04:19 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 1 Sep 2014 02:20:23 +0000 (04:20 +0200)
commit97b88096dcbeef286a1f244f65ca4e7b922f316b
treee28b01011a53cb1646b46b3f6714740c978efde5
parent42507534977e2108e397a381357ee2db209475f6
parent37c46743ee42df1d6986ba3c996e3af5b95511f7
Merge commit '37c46743ee42df1d6986ba3c996e3af5b95511f7'

* commit '37c46743ee42df1d6986ba3c996e3af5b95511f7':
  avcodec: fix missing doxygen comment marker

See: 22652dc2b8d61d6a48e3f7815fa7f4b0adf0f12f
Merged-by: Michael Niedermayer <michaelni@gmx.at>