[FFmpeg-cvslog] Merge commit '9affa784a0743b95bde135b5acfce2183afc35d8'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jun 18 01:54:02 2014 +0200| [cb037b5db49f3518b6bf3999992d5b87a7a5d32d] | committer: Michael Niedermayer

Merge commit '9affa784a0743b95bde135b5acfce2183afc35d8'

* commit '9affa784a0743b95bde135b5acfce2183afc35d8':
  vp9 encoder: use a decent default speed setting

Conflicts:
	libavcodec/libvpxenc.c

See: 34e32d6464135a03da14d5b0aef1d42796939eae
Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cb037b5db49f3518b6bf3999992d5b87a7a5d32d
---