Revision 49fb20cb libavcodec/mpegvideo.c

View differences:

libavcodec/mpegvideo.c
1448 1448
            ff_emulated_edge_mc(s->edge_emu_buffer, ptr_y, s->linesize, 17, 17+field_based,
1449 1449
                             src_x, src_y<<field_based, h_edge_pos, v_edge_pos);
1450 1450
            ptr_y = s->edge_emu_buffer;
1451
            if(!ENABLE_GRAY || !(s->flags&CODEC_FLAG_GRAY)){
1451
            if(!CONFIG_GRAY || !(s->flags&CODEC_FLAG_GRAY)){
1452 1452
                uint8_t *uvbuf= s->edge_emu_buffer+18*s->linesize;
1453 1453
                ff_emulated_edge_mc(uvbuf  , ptr_cb, s->uvlinesize, 9, 9+field_based,
1454 1454
                                 uvsrc_x, uvsrc_y<<field_based, h_edge_pos>>1, v_edge_pos>>1);
......
1475 1475
    sy <<= 2 - lowres;
1476 1476
    pix_op[lowres-1](dest_y, ptr_y, linesize, h, sx, sy);
1477 1477

  
1478
    if(!ENABLE_GRAY || !(s->flags&CODEC_FLAG_GRAY)){
1478
    if(!CONFIG_GRAY || !(s->flags&CODEC_FLAG_GRAY)){
1479 1479
        uvsx <<= 2 - lowres;
1480 1480
        uvsy <<= 2 - lowres;
1481 1481
        pix_op[lowres](dest_cb, ptr_cb, uvlinesize, h >> s->chroma_y_shift, uvsx, uvsy);
......
1581 1581
                my += s->mv[dir][i][1];
1582 1582
            }
1583 1583

  
1584
        if(!ENABLE_GRAY || !(s->flags&CODEC_FLAG_GRAY))
1584
        if(!CONFIG_GRAY || !(s->flags&CODEC_FLAG_GRAY))
1585 1585
            chroma_4mv_motion_lowres(s, dest_cb, dest_cr, ref_picture, pix_op, mx, my);
1586 1586
        break;
1587 1587
    case MV_TYPE_FIELD:
......
1870 1870
                add_dequant_dct(s, block[2], 2, dest_y + dct_offset             , dct_linesize, s->qscale);
1871 1871
                add_dequant_dct(s, block[3], 3, dest_y + dct_offset + block_size, dct_linesize, s->qscale);
1872 1872

  
1873
                if(!ENABLE_GRAY || !(s->flags&CODEC_FLAG_GRAY)){
1873
                if(!CONFIG_GRAY || !(s->flags&CODEC_FLAG_GRAY)){
1874 1874
                    if (s->chroma_y_shift){
1875 1875
                        add_dequant_dct(s, block[4], 4, dest_cb, uvlinesize, s->chroma_qscale);
1876 1876
                        add_dequant_dct(s, block[5], 5, dest_cr, uvlinesize, s->chroma_qscale);
......
1889 1889
                add_dct(s, block[2], 2, dest_y + dct_offset             , dct_linesize);
1890 1890
                add_dct(s, block[3], 3, dest_y + dct_offset + block_size, dct_linesize);
1891 1891

  
1892
                if(!ENABLE_GRAY || !(s->flags&CODEC_FLAG_GRAY)){
1892
                if(!CONFIG_GRAY || !(s->flags&CODEC_FLAG_GRAY)){
1893 1893
                    if(s->chroma_y_shift){//Chroma420
1894 1894
                        add_dct(s, block[4], 4, dest_cb, uvlinesize);
1895 1895
                        add_dct(s, block[5], 5, dest_cr, uvlinesize);
......
1911 1911
                    }
1912 1912
                }//fi gray
1913 1913
            }
1914
            else if (ENABLE_WMV2) {
1914
            else if (CONFIG_WMV2) {
1915 1915
                ff_wmv2_add_mb(s, block, dest_y, dest_cb, dest_cr);
1916 1916
            }
1917 1917
        } else {
......
1922 1922
                put_dct(s, block[2], 2, dest_y + dct_offset             , dct_linesize, s->qscale);
1923 1923
                put_dct(s, block[3], 3, dest_y + dct_offset + block_size, dct_linesize, s->qscale);
1924 1924

  
1925
                if(!ENABLE_GRAY || !(s->flags&CODEC_FLAG_GRAY)){
1925
                if(!CONFIG_GRAY || !(s->flags&CODEC_FLAG_GRAY)){
1926 1926
                    if(s->chroma_y_shift){
1927 1927
                        put_dct(s, block[4], 4, dest_cb, uvlinesize, s->chroma_qscale);
1928 1928
                        put_dct(s, block[5], 5, dest_cr, uvlinesize, s->chroma_qscale);
......
1941 1941
                s->dsp.idct_put(dest_y + dct_offset             , dct_linesize, block[2]);
1942 1942
                s->dsp.idct_put(dest_y + dct_offset + block_size, dct_linesize, block[3]);
1943 1943

  
1944
                if(!ENABLE_GRAY || !(s->flags&CODEC_FLAG_GRAY)){
1944
                if(!CONFIG_GRAY || !(s->flags&CODEC_FLAG_GRAY)){
1945 1945
                    if(s->chroma_y_shift){
1946 1946
                        s->dsp.idct_put(dest_cb, uvlinesize, block[4]);
1947 1947
                        s->dsp.idct_put(dest_cr, uvlinesize, block[5]);

Also available in: Unified diff