Changeset a2beabc2 in ffmpeg

Timestamp:

Apr 10, 2011, 1:32:29 AM (14 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

05c062e9

Parents:

d459d8e2 (diff), 347b375a (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> (04/10/11 01:31:53)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (04/10/11 01:32:29)

Message:

Merge remote branch 'qatar/master'

• qatar/master: daud: Don't write packets that are too large to have their size expressed in the bytestream.

DUPLICATE pthread: validate_thread_parameters() ignored slice-threading being intentionally off
DUPLICATE Use consistent condition for whether to run slice-threading execute function.

avformat.h: fix a misplaced #endif

DUPLCIATE vaapi: cope with VA-API 0.32, i.e. fix VC-1 decoding on Sandy Bridge.
DUPLICATE vaapi: filter out DELAYED_PIC_REF flag to determine field.

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

(No files)