Merge commit 'a4d0c6e0'
* commit 'a4d0c6e0': mpegvideo: move dct_unquantize functions up to avoid forward declarations Conflicts: libavcodec/mpegvideo.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Showing
Please
register
or
sign in
to comment