Changeset a9aa88df in ffmpeg

Timestamp:

Aug 10, 2011, 2:29:51 PM (13 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

9f06c1c6

Parents:

e2cc3311 (diff), 7221139b (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> (08/10/11 14:29:46)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (08/10/11 14:29:51)

Message:

Merge remote-tracking branch 'qatar/master'

• qatar/master: lavc: make avcodec_init() static on next bump. ac3enc: remove unneeded #include ac3enc: restructure coupling coordinate reuse calculation ac3enc: allow new coupling coordinates to be sent independently for each channel. ac3enc: separate exponent bit counting from exponent grouping. h264: propagate error return values for AV_LOG_ERROR-triggering events aac: Don't attempt to output configure an invalid channel configuration.

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

(No files)