mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2026-01-06 06:05:32 +01:00
* commit '23e85be58fc64b2e804e68b0034a08a6d257e523': h264: add a parameter to the CHROMA444 macro. h264: add a parameter to the CHROMA422 macro. Conflicts: libavcodec/h264.c libavcodec/h264.h libavcodec/h264_cavlc.c libavcodec/h264_loopfilter.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
34 KiB
34 KiB