Michael Niedermayer 9ebe041e1c Merge commit 'e93ca480c91397f82f2ea5b6a8b82ac6d0e2bfd2'
* commit 'e93ca480c91397f82f2ea5b6a8b82ac6d0e2bfd2':
  parseutil: Add more resolution aliases

Conflicts:
	doc/ffmpeg.texi
	libavutil/parseutils.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-20 04:32:28 +02:00
..
2014-07-20 02:01:50 +02:00
2015-06-10 13:08:48 -08:00
2015-07-19 19:01:00 +00: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