FFmpeg/libavformat
Michael Niedermayer 39cd9fdbf8 Merge commit '4d686fb721b485ebbc4c7779d927d876c1e630f7'
* commit '4d686fb721b485ebbc4c7779d927d876c1e630f7':
  matroskaenc: convert avstream stereo3d side data during encoding

Conflicts:
	libavformat/matroskaenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-29 00:44:47 +02:00
..
2014-08-24 11:05:42 +00:00
2014-08-09 15:51:04 +02:00
2014-08-24 11:05:42 +00:00
2014-06-18 14:55:28 +02:00
2014-06-18 14:55:28 +02:00
2014-08-24 11:05:42 +00:00
2014-06-03 10:58:19 -08:00
2014-08-16 14:31:41 +02:00
2014-08-24 11:05:42 +00:00
2014-08-24 11:05:42 +00:00
2014-08-24 11:05:42 +00:00
2014-07-03 15:46:26 +02:00
2014-07-13 19:18:31 +02:00
2014-07-13 19:18:31 +02:00
2014-08-15 22:47:45 +02:00
2014-08-27 06:21:54 +00:00
2014-05-17 20:13:33 +02:00
2014-08-24 11:05:42 +00:00
2014-08-15 22:47:45 +02:00
2014-07-19 19:44:56 +02:00
2014-08-24 11:05:42 +00:00
2014-08-24 11:05:42 +00:00
2014-08-03 03:18:52 +02:00
2014-08-16 14:31:41 +02:00
2014-08-24 11:05:42 +00:00
2014-08-15 22:47:45 +02:00
2014-08-24 11:05:42 +00:00
2014-08-24 11:05:42 +00:00