Merge commit '292dbe5e8a95d38c1324b0432fbaca67f8fe4b73'

Browse Source

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

Conflicts:
	libavcodec/libmp3lame.c

See: 07e7bc9cbda12921ddf0ae6bbbf9328f29c3c63e
Merged-by: Michael Niedermayer <michaelni@gmx.at>

...

This commit is contained in:

Michael Niedermayer 2014-03-31 02:18:24 +02:00

parent 801b94a782 292dbe5e8a

commit e4fc7e3d4d

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available