diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-08-08 23:35:22 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-08-09 00:01:48 +0200 |
| commit | 9a5f61ac62ab1a191f0ea81caef1e386a4c1e242 (patch) | |
| tree | d853b7de1ed0aad3e4e237e0d72530733481727f /libavcodec/sipr16k.c | |
| parent | 640a905ece0fecc83f05dfaca7e91a0ecc65d746 (diff) | |
| parent | 5caa2de19ece830e32c95731bc92a423d55cff0c (diff) | |
| download | ffmpeg-9a5f61ac62ab1a191f0ea81caef1e386a4c1e242.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
libx264: do not set pic quality if no frame is output
libx264: add preset, tune, profile and fastfirstpass private options
Conflicts:
libavcodec/libx264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/sipr16k.c')
0 files changed, 0 insertions, 0 deletions