← Back to branch summary

~ubuntu-branches/ubuntu/wily/x264/wily-proposed

« back to all changes in this revision

Viewing changes to common/mc.c

  • Committer: Package Import Robot
  • Author(s): Reinhard Tartler
  • Date: 2012-01-19 07:28:39 UTC
  • mfrom: (12.1.11 experimental)
  • Revision ID: package-import@ubuntu.com-20120119072839-0vj6g40ky09d9nru
Tags: 2:0.120.2127+gitf33c8cb-2ubuntu1
* Merge from Debian, remaining changes:
  - build against libgpac-dev to enable .mp4 output

Show diffs side-by-side

added added

removed removed

Lines of Context:
common/mc.c
304
304
        }
305
305
}
306
306
 
307
 
void x264_plane_copy_deinterleave_c( pixel *dstu, int i_dstu,
308
 
                                     pixel *dstv, int i_dstv,
309
 
                                     pixel *src, int i_src, int w, int h )
 
307
static void x264_plane_copy_deinterleave_c( pixel *dstu, int i_dstu,
 
308
                                            pixel *dstv, int i_dstv,
 
309
                                            pixel *src, int i_src, int w, int h )
310
310
{
311
311
    for( int y=0; y<h; y++, dstu+=i_dstu, dstv+=i_dstv, src+=i_src )
312
312
        for( int x=0; x<w; x++ )
316
316
        }
317
317
}
318
318
 
319
 
void x264_plane_copy_deinterleave_rgb_c( pixel *dsta, int i_dsta,
320
 
                                         pixel *dstb, int i_dstb,
321
 
                                         pixel *dstc, int i_dstc,
322
 
                                         pixel *src, int i_src, int pw, int w, int h )
 
319
static void x264_plane_copy_deinterleave_rgb_c( pixel *dsta, int i_dsta,
 
320
                                                pixel *dstb, int i_dstb,
 
321
                                                pixel *dstc, int i_dstc,
 
322
                                                pixel *src, int i_src, int pw, int w, int h )
323
323
{
324
324
    for( int y=0; y<h; y++, dsta+=i_dsta, dstb+=i_dstb, dstc+=i_dstc, src+=i_src )
325
325
    {
506
506
 
507
507
    pf->hpel_filter = hpel_filter;
508
508
 
509
 
    pf->prefetch_fenc = prefetch_fenc_null;
 
509
    pf->prefetch_fenc_420 = prefetch_fenc_null;
 
510
    pf->prefetch_fenc_422 = prefetch_fenc_null;
510
511
    pf->prefetch_ref  = prefetch_ref_null;
511
512
    pf->memcpy_aligned = memcpy;
512
513
    pf->memzero_aligned = memzero_aligned;