Changeset 4478e9d in ffmpeg

Timestamp:

Dec 31, 2011, 11:07:31 PM (13 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

ca0350f

Parents:

2cba62bd (diff), febd0222 (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> (12/31/11 22:24:53)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (12/31/11 23:07:31)

Message:

Merge remote-tracking branch 'qatar/master'

• qatar/master: FATE: add tests for dfa mpegaudiodec: fix seeking. mpegaudiodec: fix compilation when testing the unchecked bitstream reader threads: add sysconf based number of CPUs detection threads: always include necessary headers for number of CPUs detection threads: default to automatic thread count detection Changelog: restore version <next> header cook: K&R formatting cosmetics

Conflicts:

Changelog
libavcodec/version.h

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

(No files)