~ubuntu-branches/debian/experimental/libav/experimental

« back to all changes in this revision

Viewing changes to libavcodec/wmv2.c

  • Committer: Package Import Robot
  • Author(s): Reinhard Tartler
  • Date: 2014-01-18 15:46:55 UTC
  • mfrom: (1.1.24)
  • Revision ID: package-import@ubuntu.com-20140118154655-iz6u00yevkat1jqi
Tags: 6:10~alpha2-1
New Upstream release 10_alpha2. This upstream git snapshot has too many
changes to list here, cf. to the upstream Changelog:
http://git.libav.org/?p=libav.git;a=blob;f=Changelog;hb=refs/tags/v10_alpha2

Show diffs side-by-side

added added

removed removed

Lines of Context:
117
117
    uvlinesize = s->uvlinesize;
118
118
    ptr = ref_picture[0] + (src_y * linesize) + src_x;
119
119
 
120
 
    if(s->flags&CODEC_FLAG_EMU_EDGE){
121
 
        if(src_x<1 || src_y<1 || src_x + 17  >= s->h_edge_pos
122
 
                              || src_y + h+1 >= v_edge_pos){
123
 
            s->vdsp.emulated_edge_mc(s->edge_emu_buffer,
124
 
                                     ptr - 1 - s->linesize,
125
 
                                     s->linesize, s->linesize,
126
 
                                     19, 19,
127
 
                                     src_x - 1, src_y - 1,
128
 
                                     s->h_edge_pos, s->v_edge_pos);
129
 
            ptr= s->edge_emu_buffer + 1 + s->linesize;
130
 
            emu=1;
131
 
        }
 
120
    if(src_x<1 || src_y<1 || src_x + 17  >= s->h_edge_pos
 
121
                          || src_y + h+1 >= v_edge_pos){
 
122
        s->vdsp.emulated_edge_mc(s->edge_emu_buffer,
 
123
                                 ptr - 1 - s->linesize,
 
124
                                 s->linesize, s->linesize,
 
125
                                 19, 19,
 
126
                                 src_x - 1, src_y - 1,
 
127
                                 s->h_edge_pos, s->v_edge_pos);
 
128
        ptr= s->edge_emu_buffer + 1 + s->linesize;
 
129
        emu=1;
132
130
    }
133
131
 
134
132
    s->dsp.put_mspel_pixels_tab[dxy](dest_y             , ptr             , linesize);