Merge commit 'f61272f0'
* commit 'f61272f0': ratecontrol: K&R cosmetic formatting rtpdec: Remove a useless todo comment Conflicts: libavcodec/ratecontrol.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Showing
This diff is collapsed.
Please
register
or
sign in
to comment