1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00

more format abbreviations

Originally committed as revision 8798 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Benoit Fouet 2007-04-24 11:45:13 +00:00
parent 2f8fe719c6
commit 7d88b5ca02
3 changed files with 76 additions and 1 deletions

View File

@ -308,6 +308,54 @@ The following abbreviations are recognized:
352x288
@item 4cif
704x576
@item qqvga
160x120
@item qvga
320x240
@item vga
640x480
@item svga
800x600
@item xga
1024x768
@item uxga
1600x1200
@item qxga
2048x1536
@item sxga
1280x1024
@item qsxga
2560x2048
@item hsxga
5120x4096
@item wvga
852x480
@item wxga
1366x768
@item wsxga
1600x1024
@item wuxga
1920x1200
@item woxga
2560x1600
@item wqsxga
3200x2048
@item wquxga
3840x2400
@item whsxga
6400x4096
@item whuxga
7680x4800
@item cga
320x200
@item ega
640x350
@item hd480
852x480
@item hd720
1280x720
@item hd1080
1920x1080
@end table
@item -aspect aspect

View File

@ -109,7 +109,10 @@ VideoBufferSize 40
VideoFrameRate 3
# Size of the video frame: WxH (default: 160x128)
# The following abbreviations are defined: sqcif, qcif, cif, 4cif
# The following abbreviations are defined: sqcif, qcif, cif, 4cif, qqvga,
# qvga, vga, svga, xga, uxga, qxga, sxga, qsxga, hsxga, wvga, wxga, wsxga,
# wuxga, woxga, wqsxga, wquxga, whsxga, whuxga, cga, ega, hd480, hd720,
# hd1080
VideoSize 160x128
# Transmit only intra frames (useful for low bitrates, but kills frame rate).

View File

@ -2477,6 +2477,30 @@ static AbvEntry frame_abvs[] = {
{ "qcif", 176, 144, 0, 0 },
{ "cif", 352, 288, 0, 0 },
{ "4cif", 704, 576, 0, 0 },
{ "qqvga", 160, 120, 0, 0 },
{ "qvga", 320, 240, 0, 0 },
{ "vga", 640, 480, 0, 0 },
{ "svga", 800, 600, 0, 0 },
{ "xga", 1024, 768, 0, 0 },
{ "uxga", 1600,1200, 0, 0 },
{ "qxga", 2048,1536, 0, 0 },
{ "sxga", 1280,1024, 0, 0 },
{ "qsxga", 2560,2048, 0, 0 },
{ "hsxga", 5120,4096, 0, 0 },
{ "wvga", 852, 480, 0, 0 },
{ "wxga", 1366, 768, 0, 0 },
{ "wsxga", 1600,1024, 0, 0 },
{ "wuxga", 1920,1200, 0, 0 },
{ "woxga", 2560,1600, 0, 0 },
{ "wqsxga", 3200,2048, 0, 0 },
{ "wquxga", 3840,2400, 0, 0 },
{ "whsxga", 6400,4096, 0, 0 },
{ "whuxga", 7680,4800, 0, 0 },
{ "cga", 320, 200, 0, 0 },
{ "ega", 640, 350, 0, 0 },
{ "hd480", 852, 480, 0, 0 },
{ "hd720", 1280, 720, 0, 0 },
{ "hd1080", 1920,1080, 0, 0 },
};
int parse_image_size(int *width_ptr, int *height_ptr, const char *str)