Merge commit '8747926'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 6 Nov 2014 09:50:59 +0000 (10:50 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 6 Nov 2014 09:50:59 +0000 (10:50 +0100)
commita0617025dd264ba1db6a3dccfaed942ba0dd2bbe
tree9dac7508bd98a841a4f491d68318cb1d3b5a4588
parent817663897e59f45f60016fa9d3d16e325b803967
parent874792641ea4d52e0e03835da630565e63cc1d1f
Merge commit '8747926'

* commit '8747926':
  vorbis_parser: use a dedicated AVClass for logging

Conflicts:
libavcodec/vorbis_parser.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/vorbis_parser.c
libavcodec/vorbis_parser.h