mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-08-04 18:29:59 +02:00
Merge remote-tracking branch 'qatar/master'
* qatar/master: libvpxenc: Allow enabling constrained quality (CQ) mode Conflicts: configure libavcodec/libvpxenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
bc17a6f5c0