Merge commit '9ecb858775483a76c137e8e1ad45a95e318bca61'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 5 Feb 2014 02:25:52 +0000 (03:25 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 5 Feb 2014 02:27:13 +0000 (03:27 +0100)
* commit '9ecb858775483a76c137e8e1ad45a95e318bca61':
  doxy: Format @code blocks so they render properly

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavutil/dict.h

Simple merge