mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-01-19 05:49:09 +02:00
3245c8b669
* qatar/master: mxfdec: replace x>>av_log2(sizeof(..)) by x/sizeof(..). x86: h264_intrapred: Don't add the 'd' suffix to the SPLATB_REG macro Conflicts: libavformat/mxfdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>