Changeset 7876f14f in ffmpeg

Timestamp:

Nov 22, 2011, 1:54:50 AM (13 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

78317881

Parents:

2a0e1801 (diff), a8fe9a72 (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.

Message:

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>

(No files)