diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-20 04:32:28 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-20 04:32:28 +0200 |
| commit | 9ebe041e1ca898ed725051460961f1fda5f7a20b (patch) | |
| tree | 716df11c495620ee39366c329b9f4b8d068ce3ce /libavutil/opt.c | |
| parent | cb53db144c104f447782b8918e94704484aedc8b (diff) | |
| parent | e93ca480c91397f82f2ea5b6a8b82ac6d0e2bfd2 (diff) | |
| download | ffmpeg-9ebe041e1ca898ed725051460961f1fda5f7a20b.tar.gz | |
Merge commit 'e93ca480c91397f82f2ea5b6a8b82ac6d0e2bfd2'
* commit 'e93ca480c91397f82f2ea5b6a8b82ac6d0e2bfd2':
parseutil: Add more resolution aliases
Conflicts:
doc/ffmpeg.texi
libavutil/parseutils.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavutil/opt.c')
0 files changed, 0 insertions, 0 deletions