Michael Niedermayer c40a35f8a7 Merge remote-tracking branch 'qatar/master' ...

* qatar/master:
  indeo3: check per-plane data buffer against input buffer bounds.
  avconv: Handle audio sync for non-S16 sample formats.
  pthread: don't increment index on zero-sized packets.

Conflicts:
	libavcodec/indeo3.c

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

2011-11-30 02:34:35 +01:00

29 KiB

Raw Blame History

View Raw