mirror of
https://github.com/xenia-project/FFmpeg.git
synced 2025-02-07 20:58:03 +00:00
![Michael Niedermayer](/assets/img/avatar_default.png)
* qatar/master: dnxhddec: avoid a branch in 10-bit decode_dct_block() H.264: Add optimizations to predict x86 assembly. riff: Add mpgv MPEG-2 fourcc add Flash Screen Video 2 decoder Conflicts: configure doc/general.texi libavcodec/Makefile libavcodec/allcodecs.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>