mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit '8769113accf1f3b78634dec60b37f7354ed6d88d'
* commit '8769113accf1f3b78634dec60b37f7354ed6d88d': mpeg4videoenc: K&R formatting cosmetics Conflicts: libavcodec/mpeg4videoenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
18df75fa2f