Merge commit '292dbe5e'
* commit '292dbe5e': libmp3lame: add comments about CBR/VBR modes Conflicts: libavcodec/libmp3lame.c See: 07e7bc9cMerged-by:Michael Niedermayer <michaelni@gmx.at>
Showing
Please
register
or
sign in
to comment
* commit '292dbe5e': libmp3lame: add comments about CBR/VBR modes Conflicts: libavcodec/libmp3lame.c See: 07e7bc9cMerged-by:Michael Niedermayer <michaelni@gmx.at>