[FFmpeg-cvslog] Merge commit 'd2ef708c95ace2518deffe830a9c439aeb9edd5d'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jun  1 11:57:43 2014 +0200| [754bf1212c5a256737a04a8f0d3bb83d1b615d8c] | committer: Michael Niedermayer

Merge commit 'd2ef708c95ace2518deffe830a9c439aeb9edd5d'

* commit 'd2ef708c95ace2518deffe830a9c439aeb9edd5d':
  matroskaenc: Allow VP9 and Opus in webm

Conflicts:
	libavformat/matroskaenc.c

See: 820ffaed0f64b7ec27275d093c6f81e181c86e94
Merged-by: Michael Niedermayer <michaelni at gmx.at>

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