ffmpeg | branch: master | Michael Niedermayer <mich...@niedermayer.cc> | Mon
Jul 20 04:32:28 2015 +0200| [9ebe041e1ca898ed725051460961f1fda5f7a20b] |
committer: Michael Niedermayer
Merge commit 'e93ca480c91397f82f2ea5b6a8b82ac6d0e2bfd2'
* commit 'e93ca480c91397f82f2ea5b6a8b82ac6d0e2bfd2':
parseutil: Add more resolution aliases
Conflicts:
doc/ffmpeg.texi
libavutil/parseutils.c
Merged-by: Michael Niedermayer <mich...@niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9ebe041e1ca898ed725051460961f1fda5f7a20b
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
