mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-09-02 14:33:23 +02:00
Merge commit 'b7b1bf9166ac3102c401295fdd5d4933c512aa50'
* commit 'b7b1bf9166ac3102c401295fdd5d4933c512aa50': mpegts: K&R formatting cosmetics Conflicts: libavformat/mpegtsenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
ec0b08d20b