Merge commit '5b5338f6'
* commit '5b5338f6': hqx: Implement slice-threaded decoding Conflicts: libavcodec/hqx.c libavcodec/hqx.h See: eff72a6cMerged-by:Michael Niedermayer <michaelni@gmx.at>
Showing
This diff is collapsed.
Please
register
or
sign in
to comment