diff options
| author | Michael Niedermayer <[email protected]> | 2014-03-31 02:18:24 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2014-03-31 02:18:24 +0200 |
| commit | e4fc7e3d4de96ba16582d2500f377ecdece28401 (patch) | |
| tree | a06c21ce1be8d82db1160aff678b6a549660f86a | |
| parent | 801b94a78294cd90efc1e87fb1f03948203e88db (diff) | |
| parent | 292dbe5e8a95d38c1324b0432fbaca67f8fe4b73 (diff) | |
Merge commit '292dbe5e8a95d38c1324b0432fbaca67f8fe4b73'
* commit '292dbe5e8a95d38c1324b0432fbaca67f8fe4b73':
libmp3lame: add comments about CBR/VBR modes
Conflicts:
libavcodec/libmp3lame.c
See: 07e7bc9cbda12921ddf0ae6bbbf9328f29c3c63e
Merged-by: Michael Niedermayer <[email protected]>
0 files changed, 0 insertions, 0 deletions