Merge commit 'ef9732162cd4b593c6db28fdd352ebef21b5c1ca'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 1 May 2014 15:49:38 +0000 (17:49 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 1 May 2014 15:49:57 +0000 (17:49 +0200)
commitb917d7024e3613155b3c6428ad9049156d55286d
tree2b128fe5b09fbda7ffb17084c952e71fa81044ce
parentbb5657fabfecd4007816d7310a410f628aa5bf91
parentef9732162cd4b593c6db28fdd352ebef21b5c1ca
Merge commit 'ef9732162cd4b593c6db28fdd352ebef21b5c1ca'

* commit 'ef9732162cd4b593c6db28fdd352ebef21b5c1ca':
  rmdec: do not export anything to AVCodecContext.codec_name

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