Merge commit '86a04326'
* commit '86a04326': Silicon Graphics Motion Video Compressor 1 & 2 decoder Conflicts: Changelog libavcodec/avcodec.h libavcodec/mvcdec.c libavcodec/version.h See: 746b1dccMerged-by: Michael Niedermayer <michaelni@gmx.at>
Showing
Please
register
or
sign in
to comment