diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-11-22 02:54:50 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-11-22 02:54:50 +0100 |
| commit | 7876f14f8be9d78de1875ff38390d2a37ac86ec3 (patch) | |
| tree | 10cb7859a2a50ff06552ac8465ea35c61b5679ec /ffpresets | |
| parent | 2a0e180144a3e96b32b4f2b99e48be59bc8a1915 (diff) | |
| parent | a8fe9a7242cfc7351957c0ec086d0722b2a653da (diff) | |
| download | ffmpeg-7876f14f8be9d78de1875ff38390d2a37ac86ec3.tar.gz | |
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>
Diffstat (limited to 'ffpresets')
0 files changed, 0 insertions, 0 deletions