# HG changeset patch # User kostya # Date 1235495397 0 # Node ID b7c69cee2e92c2d0cb23419c17e54b1e85201c02 # Parent 2bf694251330508d4013f02e7dc9c4384468b5b3 Rename buf_vdpau to buf_start Patch by Gwenole Beauchesne <(antonym of "joined")-desktop> diff -r 2bf694251330 -r b7c69cee2e92 vc1.c --- a/vc1.c Tue Feb 24 16:12:47 2009 +0000 +++ b/vc1.c Tue Feb 24 17:09:57 2009 +0000 @@ -4142,7 +4142,7 @@ MpegEncContext *s = &v->s; AVFrame *pict = data; uint8_t *buf2 = NULL; - const uint8_t *buf_vdpau = buf; + const uint8_t *buf_start = buf; /* no supplementary picture */ if (buf_size == 0) { @@ -4188,7 +4188,7 @@ switch(AV_RB32(start)){ case VC1_CODE_FRAME: if (s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU) - buf_vdpau = start; + buf_start = start; buf_size2 = vc1_unescape_buffer(start + 4, size, buf2); break; case VC1_CODE_ENTRYPOINT: /* it should be before frame data */ @@ -4279,7 +4279,7 @@ if ((CONFIG_VC1_VDPAU_DECODER || CONFIG_WMV3_VDPAU_DECODER) &&s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU) - ff_vdpau_vc1_decode_picture(s, buf_vdpau, (buf + buf_size) - buf_vdpau); + ff_vdpau_vc1_decode_picture(s, buf_start, (buf + buf_size) - buf_start); else { ff_er_frame_start(s);