diff options
| -rw-r--r-- | doc/utils.texi | 12 | ||||
| -rw-r--r-- | libavutil/parseutils.c | 6 | ||||
| -rw-r--r-- | libavutil/version.h | 2 |
3 files changed, 19 insertions, 1 deletions
diff --git a/doc/utils.texi b/doc/utils.texi index 75f7fdcc99..243973d419 100644 --- a/doc/utils.texi +++ b/doc/utils.texi @@ -198,6 +198,18 @@ The following abbreviations are recognized: 3996x2160 @item 4kscope 4096x1716 +@item nhd +640x360 +@item hqvga +240x160 +@item wqvga +400x240 +@item fwqvga +432x240 +@item hvga +480x320 +@item qhd +960x540 @end table @anchor{video rate syntax} diff --git a/libavutil/parseutils.c b/libavutil/parseutils.c index 5797e9efb3..1e1b93e8e5 100644 --- a/libavutil/parseutils.c +++ b/libavutil/parseutils.c @@ -115,6 +115,12 @@ static const VideoSizeAbbr video_size_abbrs[] = { { "4k", 4096,2160 }, /* Digital Cinema System Specification */ { "4kflat", 3996,2160 }, { "4kscope", 4096,1716 }, + { "nhd", 640,360 }, + { "hqvga", 240,160 }, + { "wqvga", 400,240 }, + { "fwqvga", 432,240 }, + { "hvga", 480,320 }, + { "qhd", 960,540 }, }; static const VideoRateAbbr video_rate_abbrs[]= { diff --git a/libavutil/version.h b/libavutil/version.h index cc64e4ab10..41e479cce7 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -76,7 +76,7 @@ #define LIBAVUTIL_VERSION_MAJOR 52 #define LIBAVUTIL_VERSION_MINOR 46 -#define LIBAVUTIL_VERSION_MICRO 100 +#define LIBAVUTIL_VERSION_MICRO 101 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ LIBAVUTIL_VERSION_MINOR, \ |