mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-10-01 00:54:33 +02:00
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavc: add support for interleaved chroma formats to libx264.
Conflicts:
libavcodec/libx264.c
See: 283fb76d3d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
4fdf2fa94a