← Back to branch summary

~ubuntu-branches/ubuntu/precise/libav/precise-updates

« back to all changes in this revision

Viewing changes to libavcodec/vdpau.c

  • Committer: Bazaar Package Importer
  • Author(s): Reinhard Tartler
  • Date: 2011-07-21 21:12:27 UTC
  • mfrom: (1.1.9 experimental)
  • Revision ID: james.westby@ubuntu.com-20110721211227-i7f0fi12n1t9vd8e
Tags: 4:0.7.1-1ubuntu1
* Merge from debian/unstable
  - don't build against libfaad, libdirac, librtmp and libopenjpeg
    (all in universe)
  - Extra conflicts on libswscale-extra-1 (can be dropped after natty release)

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavcodec/vdpau.c
183
183
    render->info.h264.deblocking_filter_control_present_flag = h->pps.deblocking_filter_parameters_present;
184
184
    render->info.h264.redundant_pic_cnt_present_flag         = h->pps.redundant_pic_cnt_present;
185
185
    memcpy(render->info.h264.scaling_lists_4x4, h->pps.scaling_matrix4, sizeof(render->info.h264.scaling_lists_4x4));
186
 
    memcpy(render->info.h264.scaling_lists_8x8, h->pps.scaling_matrix8, sizeof(render->info.h264.scaling_lists_8x8));
 
186
    memcpy(render->info.h264.scaling_lists_8x8[0], h->pps.scaling_matrix8[0], sizeof(render->info.h264.scaling_lists_8x8[0]));
 
187
    memcpy(render->info.h264.scaling_lists_8x8[1], h->pps.scaling_matrix8[3], sizeof(render->info.h264.scaling_lists_8x8[0]));
187
188
 
188
189
    ff_draw_horiz_band(s, 0, s->avctx->height);
189
190
    render->bitstream_buffers_used = 0;