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

* qatar/master:
  pthread: add some malloc failure checks
  avconv: cosmetics, reformat transcode_init()
  avconv: rename 'os' variable to 'oc'
  doc/filters: fix some typos.
  configure: add libpulse to help output

Conflicts:
	avconv.c
	configure

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

2011-11-22 02:54:50 +01:00

181 KiB

Raw Blame History

View Raw