FFmpeg/libavformat
Michael Niedermayer 754bf1212c Merge commit 'd2ef708c95ace2518deffe830a9c439aeb9edd5d'
* commit 'd2ef708c95ace2518deffe830a9c439aeb9edd5d':
  matroskaenc: Allow VP9 and Opus in webm

Conflicts:
	libavformat/matroskaenc.c

See: 820ffaed0f64b7ec27275d093c6f81e181c86e94
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-01 12:00:20 +02:00
..
2014-05-17 20:13:33 +02:00
2014-05-20 00:00:45 +02:00
2014-04-27 14:50:14 +02:00
2014-05-20 00:00:45 +02:00
2014-04-16 19:41:41 +02:00
2014-04-16 19:41:41 +02:00
2014-04-14 21:40:59 +02:00
2014-04-05 02:18:09 +02:00
2014-04-22 20:44:31 +02:00
2014-05-07 23:39:47 +02:00
2014-05-17 20:13:33 +02:00
2014-04-27 15:14:32 +02:00
2014-05-28 21:51:38 +03:00
2014-04-20 20:56:02 +02:00
2014-04-23 15:10:42 +02:00
2014-05-07 23:39:47 +02:00
2014-04-15 13:51:48 +02:00