* making resolution abbreviations right

    * introducing sntsc/spal for square pixel ntsc/pal

Originally committed as revision 2177 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/ffmpeg.c b/ffmpeg.c
index a8bd47ff7206c0682ced85db08ec889896423e3e..e62280ddda5cf022ce31186b6a9fcc4907231629 100644 (file)
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -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) {

diff --git a/libavformat/utils.c b/libavformat/utils.c
index 297f5b5c04ca450414ee062258f27ba614d23401..eed4a8804c11a883770fcfb55c11141f83064d7d 100644 (file)
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -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 },