Commit e4fc7e3d authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '292dbe5e'

* commit '292dbe5e':
  libmp3lame: add comments about CBR/VBR modes

Conflicts:
	libavcodec/libmp3lame.c

See: 07e7bc9cMerged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 801b94a7 292dbe5e
Markdown is supported
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