diff options
| author | Roman Shaposhnik <roman@shaposhnik.org> | 2003-08-29 06:58:55 +0000 |
|---|---|---|
| committer | Roman Shaposhnik <roman@shaposhnik.org> | 2003-08-29 06:58:55 +0000 |
| commit | ba2a8cb40b5f3260923f70f6b35040689ba473f6 (patch) | |
| tree | fad48244fdfae31b61d3b7c8425b79b09d573556 /libavformat/utils.c | |
| parent | 400738b1fb8cac393b5160413fed8106844efb5a (diff) | |
| download | ffmpeg-ba2a8cb40b5f3260923f70f6b35040689ba473f6.tar.gz | |
* making resolution abbreviations right
* introducing sntsc/spal for square pixel ntsc/pal
Originally committed as revision 2177 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/utils.c')
| -rw-r--r-- | libavformat/utils.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index 297f5b5c04..eed4a8804c 100644 --- 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 }, |