Merge commit 'e44b58924fe7b180bf8b0c277c15d1a58210a0e9'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 27 Jan 2015 16:05:59 +0000 (17:05 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 27 Jan 2015 16:08:40 +0000 (17:08 +0100)
commit3c831fba08698293034db5ecaf8d74aa5fe453f8
tree8e42a1e32c1f1a7b547855048a809f7e5468cece
parenta76440239428190a6a5b303f0e87a7e1ae2cc881
parente44b58924fe7b180bf8b0c277c15d1a58210a0e9
Merge commit 'e44b58924fe7b180bf8b0c277c15d1a58210a0e9'

* commit 'e44b58924fe7b180bf8b0c277c15d1a58210a0e9':
  lavc: deprecate unused AVCodecContext.stream_codec_tag

Conflicts:
libavcodec/mpegvideo.c

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