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)
commitbc373595f28e20f69505dd0d29f716935c06f958
treeb7345bd4fb15fc77cb1c01b4eb9edf0f72ccf454
parentd5227ceff13e52eddf1fd02e0042ebc9aa628791
parent6f54dc43cee6b2f5d183acf98b32a3cf8be4a4fc
Merge commit '6f54dc43cee6b2f5d183acf98b32a3cf8be4a4fc'

* commit '6f54dc43cee6b2f5d183acf98b32a3cf8be4a4fc':
  mpegvideo: Drop stream_codec_tag

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