Merge commit 'f5c4d38c'
* commit 'f5c4d38c': qsvdec: properly handle asynchronous decoding Conflicts: libavcodec/qsvdec.c Merged-by:Michael Niedermayer <michael@niedermayer.cc>
Showing
Please
register
or
sign in
to comment
* commit 'f5c4d38c': qsvdec: properly handle asynchronous decoding Conflicts: libavcodec/qsvdec.c Merged-by:Michael Niedermayer <michael@niedermayer.cc>