RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

lavu/parseutils: add more resolutions 

See http://en.wikipedia.org/wiki/Graphics_display_resolution

Signed-off-by: Niv Sardi <xaiki@evilgiggle.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
This commit is contained in:
Niv Sardi 2013-10-04 11:36:53 -03:00 committed by Stefano Sabatini
parent b67cb58520
commit 49ba6e56bd
3 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
doc/utils.texi
View File

@ -198,6 +198,18 @@ The following abbreviations are recognized:
3996x2160 3996x2160
@item 4kscope @item 4kscope
4096x1716 4096x1716
@item nhd
640x360
@item hqvga
240x160
@item wqvga
400x240
@item fwqvga
432x240
@item hvga
480x320
@item qhd
960x540
@end table @end table
@anchor{video rate syntax} @anchor{video rate syntax}

6
libavutil/parseutils.c
View File

@ -115,6 +115,12 @@ static const VideoSizeAbbr video_size_abbrs[] = {
{ "4k", 4096,2160 }, /* Digital Cinema System Specification */ { "4k", 4096,2160 }, /* Digital Cinema System Specification */
{ "4kflat", 3996,2160 }, { "4kflat", 3996,2160 },
{ "4kscope", 4096,1716 }, { "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[]= { static const VideoRateAbbr video_rate_abbrs[]= {

2
libavutil/version.h
View File

@ -76,7 +76,7 @@
#define LIBAVUTIL_VERSION_MAJOR 52 #define LIBAVUTIL_VERSION_MAJOR 52
#define LIBAVUTIL_VERSION_MINOR 46 #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, \ #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
LIBAVUTIL_VERSION_MINOR, \ LIBAVUTIL_VERSION_MINOR, \