Merge commit '9affa784a0743b95bde135b5acfce2183afc35d8'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Jun 2014 23:54:02 +0000 (01:54 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Jun 2014 23:54:02 +0000 (01:54 +0200)
commitcb037b5db49f3518b6bf3999992d5b87a7a5d32d
treec3439e4528554f0c841ffb60fe2beba0cf162d19
parent3f2f87cd5a84dc44de76af49a05778cb89f6de5c
parent9affa784a0743b95bde135b5acfce2183afc35d8
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>