Skip to content
Snippets Groups Projects
Commit 15daa8f9 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

Merge commit 'f61272f0' 


* commit 'f61272f0':
  ratecontrol: K&R cosmetic formatting
  rtpdec: Remove a useless todo comment

Conflicts:
	libavcodec/ratecontrol.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents e730c3a2 f61272f0
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment