[SCM] libav/experimental: Rename buf_vdpau to buf_start Patch by Gwenole Beauchesne <g$lastname> <at> <(antonym of "joined")-desktop><com>
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 16:39:23 UTC 2013
The following commit has been merged in the experimental branch:
commit 4daa41c41586c1a596567a63140c6ba17113d491
Author: Gwenole Beauchesne <gbeauchesne at splitted-desktop.com>
Date: Tue Feb 24 17:09:57 2009 +0000
Rename buf_vdpau to buf_start
Patch by Gwenole Beauchesne <g$lastname> <at> <(antonym of "joined")-desktop><com>
Originally committed as revision 17561 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c
index 96139a8..ca76ada 100644
--- a/libavcodec/vc1.c
+++ b/libavcodec/vc1.c
@@ -4142,7 +4142,7 @@ static int vc1_decode_frame(AVCodecContext *avctx,
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 @@ static int vc1_decode_frame(AVCodecContext *avctx,
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 @@ static int vc1_decode_frame(AVCodecContext *avctx,
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);
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list