Merge commit '92e4b643dfdafdb6528f1baffdbea2b9a028d7c0'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 1 May 2014 15:25:50 +0000 (17:25 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 1 May 2014 15:26:06 +0000 (17:26 +0200)
commit00c3ff26f230048e844130fcae0ab29ee20991c9
tree2a4a0e97f2a5054b28c5b10b19668fcf5c71a5ae
parent7426acff1aed209bc7db4c87697a5931e177eaf1
parent92e4b643dfdafdb6528f1baffdbea2b9a028d7c0
Merge commit '92e4b643dfdafdb6528f1baffdbea2b9a028d7c0'

* commit '92e4b643dfdafdb6528f1baffdbea2b9a028d7c0':
  oggparseskeleton: do not use AVCodecContext.codec_name

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/oggparseskeleton.c