Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 22 Nov 2011 01:54:50 +0000 (02:54 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 22 Nov 2011 01:54:50 +0000 (02:54 +0100)
commit7876f14f8be9d78de1875ff38390d2a37ac86ec3
tree10cb7859a2a50ff06552ac8465ea35c61b5679ec
parent2a0e180144a3e96b32b4f2b99e48be59bc8a1915
parenta8fe9a7242cfc7351957c0ec086d0722b2a653da
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>
avconv.c
configure
ffmpeg.c
libavcodec/pthread.c