Changeset 7b7c47c8 in ffmpeg

Timestamp:

Jun 28, 2011, 12:30:04 AM (13 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

c029ea39

Parents:

65eae2a (diff), 8683c6a6 (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.

git-author:

Michael Niedermayer <michaelni@gmx.at> (06/28/11 00:29:39)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (06/28/11 00:30:04)

Message:

Merge remote-tracking branch 'qatar/master'

• qatar/master: ac3enc: move ff_ac3_encode_frame() to ac3enc_template.c ac3enc: merge log2_tab() into normalize_samples() ac3enc: Remove bit allocation fallbacks.

Merged-by: Michael Niedermayer <​michaelni@gmx.at>

(No files)