[FFmpeg-cvslog] Merge commit 'ba71c74017c287681153ec8f6f1cba650d797275'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu May  1 18:04:39 2014 +0200| [58f4d1266bce51f3b14d6d775ebf88bdcef33ef8] | committer: Michael Niedermayer

Merge commit 'ba71c74017c287681153ec8f6f1cba650d797275'

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

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=58f4d1266bce51f3b14d6d775ebf88bdcef33ef8
---