mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-07-22 04:04:14 +02:00
Merge remote-tracking branch 'qatar/master'
* qatar/master: mpeg: K&R formatting cosmetics Conflicts: libavcodec/mpeg12dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
acd7505351