Merge commit 'b6094811f9fca66cdf853420696e96fdc3e4987a'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 14 Nov 2013 12:49:31 +0000 (13:49 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 14 Nov 2013 13:01:24 +0000 (14:01 +0100)
commitdbfa4317f3f8df13d889732d62f8d6abef2ac620
tree6c14995de6623ceccc903ca3785e85eeffc5710f
parentd67d3e29779ac113fbf806754ef9398e52cd288b
parentb6094811f9fca66cdf853420696e96fdc3e4987a
Merge commit 'b6094811f9fca66cdf853420696e96fdc3e4987a'

* commit 'b6094811f9fca66cdf853420696e96fdc3e4987a':
  lavc: move MB_TYPE_* macros from avcodec.h to mpegvideo.h

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