Mercurial > libavcodec.hg
comparison utils.c @ 5127:4dbe6578f811 libavcodec
misc spelling fixes
author | diego |
---|---|
date | Tue, 12 Jun 2007 09:29:25 +0000 |
parents | 7982b376b58a |
children | 82f7eaa32f46 |
comparison
equal
deleted
inserted
replaced
5126:7982b376b58a | 5127:4dbe6578f811 |
---|---|
271 | 271 |
272 avpicture_fill(&picture, NULL, s->pix_fmt, w, h); | 272 avpicture_fill(&picture, NULL, s->pix_fmt, w, h); |
273 pixel_size= picture.linesize[0]*8 / w; | 273 pixel_size= picture.linesize[0]*8 / w; |
274 //av_log(NULL, AV_LOG_ERROR, "%d %d %d %d\n", (int)picture.data[1], w, h, s->pix_fmt); | 274 //av_log(NULL, AV_LOG_ERROR, "%d %d %d %d\n", (int)picture.data[1], w, h, s->pix_fmt); |
275 assert(pixel_size>=1); | 275 assert(pixel_size>=1); |
276 //FIXME next ensures that linesize= 2^x uvlinesize, thats needed because some MC code assumes it | 276 //FIXME next ensures that linesize= 2^x uvlinesize, that is needed because some MC code assumes it |
277 if(pixel_size == 3*8) | 277 if(pixel_size == 3*8) |
278 w= ALIGN(w, STRIDE_ALIGN<<h_chroma_shift); | 278 w= ALIGN(w, STRIDE_ALIGN<<h_chroma_shift); |
279 else | 279 else |
280 w= ALIGN(pixel_size*w, STRIDE_ALIGN<<(h_chroma_shift+3)) / pixel_size; | 280 w= ALIGN(pixel_size*w, STRIDE_ALIGN<<(h_chroma_shift+3)) / pixel_size; |
281 size[1] = avpicture_fill(&picture, NULL, s->pix_fmt, w, h); | 281 size[1] = avpicture_fill(&picture, NULL, s->pix_fmt, w, h); |
400 else | 400 else |
401 return "NULL"; | 401 return "NULL"; |
402 } | 402 } |
403 | 403 |
404 #define OFFSET(x) offsetof(AVCodecContext,x) | 404 #define OFFSET(x) offsetof(AVCodecContext,x) |
405 #define DEFAULT 0 //should be NAN but it doesnt work as its not a constant in glibc as required by ANSI/ISO C | 405 #define DEFAULT 0 //should be NAN but it does not work as it is not a constant in glibc as required by ANSI/ISO C |
406 //these names are too long to be readable | 406 //these names are too long to be readable |
407 #define V AV_OPT_FLAG_VIDEO_PARAM | 407 #define V AV_OPT_FLAG_VIDEO_PARAM |
408 #define A AV_OPT_FLAG_AUDIO_PARAM | 408 #define A AV_OPT_FLAG_AUDIO_PARAM |
409 #define S AV_OPT_FLAG_SUBTITLE_PARAM | 409 #define S AV_OPT_FLAG_SUBTITLE_PARAM |
410 #define E AV_OPT_FLAG_ENCODING_PARAM | 410 #define E AV_OPT_FLAG_ENCODING_PARAM |
1355 } AbvEntry; | 1355 } AbvEntry; |
1356 | 1356 |
1357 static AbvEntry frame_abvs[] = { | 1357 static AbvEntry frame_abvs[] = { |
1358 { "ntsc", 720, 480, 30000, 1001 }, | 1358 { "ntsc", 720, 480, 30000, 1001 }, |
1359 { "pal", 720, 576, 25, 1 }, | 1359 { "pal", 720, 576, 25, 1 }, |
1360 { "qntsc", 352, 240, 30000, 1001 }, /* VCD compliant ntsc */ | 1360 { "qntsc", 352, 240, 30000, 1001 }, /* VCD compliant NTSC */ |
1361 { "qpal", 352, 288, 25, 1 }, /* VCD compliant pal */ | 1361 { "qpal", 352, 288, 25, 1 }, /* VCD compliant PAL */ |
1362 { "sntsc", 640, 480, 30000, 1001 }, /* square pixel NTSC */ | 1362 { "sntsc", 640, 480, 30000, 1001 }, /* square pixel NTSC */ |
1363 { "spal", 768, 576, 25, 1 }, /* square pixel PAL */ | 1363 { "spal", 768, 576, 25, 1 }, /* square pixel PAL */ |
1364 { "film", 352, 240, 24, 1 }, | 1364 { "film", 352, 240, 24, 1 }, |
1365 { "ntsc-film", 352, 240, 24000, 1001 }, | 1365 { "ntsc-film", 352, 240, 24000, 1001 }, |
1366 { "sqcif", 128, 96, 0, 0 }, | 1366 { "sqcif", 128, 96, 0, 0 }, |