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)
* commit 'ba71c74017c287681153ec8f6f1cba650d797275':
  lavc: deprecate AVCodecContext.codec_name

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

Simple merge
Simple merge