diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-18 01:54:02 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-18 01:54:02 +0200 |
commit | cb037b5db49f3518b6bf3999992d5b87a7a5d32d (patch) | |
tree | c3439e4528554f0c841ffb60fe2beba0cf162d19 /ffmpeg_opt.c | |
parent | 3f2f87cd5a84dc44de76af49a05778cb89f6de5c (diff) | |
parent | 9affa784a0743b95bde135b5acfce2183afc35d8 (diff) | |
download | ffmpeg-cb037b5db49f3518b6bf3999992d5b87a7a5d32d.tar.gz |
Merge commit '9affa784a0743b95bde135b5acfce2183afc35d8'
* commit '9affa784a0743b95bde135b5acfce2183afc35d8':
vp9 encoder: use a decent default speed setting
Conflicts:
libavcodec/libvpxenc.c
See: 34e32d6464135a03da14d5b0aef1d42796939eae
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_opt.c')
0 files changed, 0 insertions, 0 deletions