Michael Niedermayer f5b26fbc2f Merge commit '16302246b1fcb7ad4e6f7bd31c49956a455336d2'
* commit '16302246b1fcb7ad4e6f7bd31c49956a455336d2':
  avconv: Add an option for automatically rotating video according to display matrix

Conflicts:
	Changelog
	ffmpeg_opt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-02 22:39:00 +02:00
..
2015-01-12 01:18:01 +01:00
2014-07-20 02:01:50 +02:00
2015-01-07 17:17:33 -09:00
2015-03-23 13:16:42 +01:00
2015-05-02 21:15:48 +02:00
2015-04-23 23:56:21 -07:00
2014-05-28 03:52:50 +02:00
2014-12-01 00:31:06 +01:00
2015-02-02 05:04:14 +01:00
2015-04-11 01:00:07 +02:00