Merge commit '6f54dc43cee6b2f5d183acf98b32a3cf8be4a4fc'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 22 May 2015 18:49:04 +0000 (20:49 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 22 May 2015 18:49:16 +0000 (20:49 +0200)
* commit '6f54dc43cee6b2f5d183acf98b32a3cf8be4a4fc':
  mpegvideo: Drop stream_codec_tag

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

Simple merge