Merge commit 'd8520d3e'
* commit 'd8520d3e': mpegvideo: Move QMAT_SHIFT* defines to the only place they are used Conflicts: libavcodec/mpegvideo.h Merged-by:Michael Niedermayer <michaelni@gmx.at>
Showing
Please
register
or
sign in
to comment