diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-11 21:46:35 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-11 21:46:35 +0100 |
| commit | afc660ab9bdfde49be14bcf9ddb38e3688a07511 (patch) | |
| tree | e6368ea4e9f65323462b90f3faa4737778d0a8ce /libavdevice/libcdio.c | |
| parent | f9b89b61f819535b4dbe6c3e9f0d6fc8becf64cb (diff) | |
| parent | 5d6a990c115850326711c2f5be4d9fd33f399616 (diff) | |
| download | ffmpeg-afc660ab9bdfde49be14bcf9ddb38e3688a07511.tar.gz | |
Merge commit '5d6a990c115850326711c2f5be4d9fd33f399616'
* commit '5d6a990c115850326711c2f5be4d9fd33f399616':
mpegaudioenc: Remove broken integer-only quantization code path
Conflicts:
libavcodec/mpegaudioenc.c
Mostly not merged, the integer code works fine.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/libcdio.c')
0 files changed, 0 insertions, 0 deletions