Revision 755bfeab libavcodec/utils.c

View differences:

libavcodec/utils.c
273 273
        pixel_size= picture.linesize[0]*8 / w;
274 274
//av_log(NULL, AV_LOG_ERROR, "%d %d %d %d\n", (int)picture.data[1], w, h, s->pix_fmt);
275 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 277
        if(pixel_size == 3*8)
278 278
            w= ALIGN(w, STRIDE_ALIGN<<h_chroma_shift);
279 279
        else
......
402 402
}
403 403

  
404 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 406
//these names are too long to be readable
407 407
#define V AV_OPT_FLAG_VIDEO_PARAM
408 408
#define A AV_OPT_FLAG_AUDIO_PARAM
......
1357 1357
static AbvEntry frame_abvs[] = {
1358 1358
    { "ntsc",      720, 480, 30000, 1001 },
1359 1359
    { "pal",       720, 576,    25,    1 },
1360
    { "qntsc",     352, 240, 30000, 1001 }, /* VCD compliant ntsc */
1361
    { "qpal",      352, 288,    25,    1 }, /* VCD compliant pal */
1360
    { "qntsc",     352, 240, 30000, 1001 }, /* VCD compliant NTSC */
1361
    { "qpal",      352, 288,    25,    1 }, /* VCD compliant PAL */
1362 1362
    { "sntsc",     640, 480, 30000, 1001 }, /* square pixel NTSC */
1363 1363
    { "spal",      768, 576,    25,    1 }, /* square pixel PAL */
1364 1364
    { "film",      352, 240,    24,    1 },

Also available in: Unified diff