Merge commit 'e93ca480c91397f82f2ea5b6a8b82ac6d0e2bfd2'
authorMichael Niedermayer <michael@niedermayer.cc>
Mon, 20 Jul 2015 02:32:28 +0000 (04:32 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Mon, 20 Jul 2015 02:32:28 +0000 (04:32 +0200)
commit9ebe041e1ca898ed725051460961f1fda5f7a20b
tree716df11c495620ee39366c329b9f4b8d068ce3ce
parentcb53db144c104f447782b8918e94704484aedc8b
parente93ca480c91397f82f2ea5b6a8b82ac6d0e2bfd2
Merge commit 'e93ca480c91397f82f2ea5b6a8b82ac6d0e2bfd2'

* commit 'e93ca480c91397f82f2ea5b6a8b82ac6d0e2bfd2':
  parseutil: Add more resolution aliases

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

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
doc/utils.texi
libavutil/parseutils.c