Merge commit 'ba71c74017c287681153ec8f6f1cba650d797275'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 1 May 2014 16:04:39 +0000 (18:04 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 1 May 2014 16:04:53 +0000 (18:04 +0200)
commit58f4d1266bce51f3b14d6d775ebf88bdcef33ef8
treef62077fa3ca7b615001530be7071bce9b93adfe9
parentd1c359777f3ebccb7565043cd79347ab305758d8
parentba71c74017c287681153ec8f6f1cba650d797275
Merge commit 'ba71c74017c287681153ec8f6f1cba650d797275'

* commit 'ba71c74017c287681153ec8f6f1cba650d797275':
  lavc: deprecate AVCodecContext.codec_name

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