Merge remote branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 10 Apr 2011 01:31:53 +0000 (03:31 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 10 Apr 2011 01:32:29 +0000 (03:32 +0200)
commita2beabc231f0d0c509e5c8f09fdab0ccb46eca10
tree43ef01d083ea7e047cfa02ea1e4d15d5ae074ab3
parentd459d8e28df12ee69c71c7181380d91e09764374
parent347b375a80afbb27c887a243097c09370cb95d19
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>
libavformat/avformat.h
libavformat/daud.c