diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-10-02 04:41:22 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-10-02 04:43:48 +0200 |
| commit | f8a4075eb83e6b55fc1185421365181b009516ba (patch) | |
| tree | 326bfe5227a94792b00054e25afe9de2ff67d0cb /libavcodec/flacenc.c | |
| parent | 0a19b4b0bae772cac7f8341e94c319c96356ee69 (diff) | |
| parent | b036a7180cf1f4926084d2f5b7ede09a041f309b (diff) | |
| download | ffmpeg-f8a4075eb83e6b55fc1185421365181b009516ba.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavc: add video/audio/encoding flags to global_quality option
libvpxenc: use libvpx's own defaults for some parameters
vpxenc: add private options
Conflicts:
libavcodec/libvpxenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/flacenc.c')
0 files changed, 0 insertions, 0 deletions