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

* making resolution abbreviations right 

* introducing sntsc/spal for square pixel ntsc/pal

Originally committed as revision 2177 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Roman Shaposhnik 2003-08-29 06:58:55 +00:00
parent 400738b1fb
commit ba2a8cb40b
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ffmpeg.c
View File

@ -2577,7 +2577,7 @@ static void show_formats(void)
printf(" %s:", up->name);
printf("\n");
printf("Frame size, frame rate abbreviations: ntsc pal film ntsc-film sqcif qcif cif 4cif\n");
printf("Frame size, frame rate abbreviations: ntsc pal qntsc qpal sntsc spal film ntsc-film sqcif qcif cif 4cif\n");
printf("Motion estimation methods:");
pp = motion_str;
while (*pp) {

8
libavformat/utils.c
View File

@ -1224,8 +1224,12 @@ typedef struct {
} AbvEntry;
static AbvEntry frame_abvs[] = {
{ "ntsc", 352, 240, 30000, 1001 },
{ "pal", 352, 288, 25, 1 },
{ "ntsc", 720, 480, 30000, 1001 },
{ "pal", 720, 576, 25, 1 },
{ "qntsc", 352, 240, 30000, 1001 }, /* VCD compliant ntsc */
{ "qpal", 352, 288, 25, 1 }, /* VCD compliant pal */
{ "sntsc", 352, 240, 30000, 1001 }, /* square pixel ntsc */
{ "spal", 352, 288, 25, 1 }, /* square pixel pal */
{ "film", 352, 240, 24, 1 },
{ "ntsc-film", 352, 240, 24000, 1001 },
{ "sqcif", 128, 96, 0, 0 },