Changeset afc660ab in ffmpeg

Timestamp:

Nov 11, 2013, 8:46:35 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

43bf4297

Parents:

f9b89b61 (diff), 5d6a990c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

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>

(No files)