aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/imgconvert.c
diff options
context:
space:
mode:
authorVitor Sessak <vitor1001@gmail.com>2009-11-10 19:36:58 +0000
committerVitor Sessak <vitor1001@gmail.com>2009-11-10 19:36:58 +0000
commit51ae2142d5ec6c00621f662631b6347bc1b2669c (patch)
tree80c89c1292cab63386084c701fbfa26f47659adf /libavcodec/imgconvert.c
parent8cbcb1c732a6abf07a3db688ff47fb6548b47c9e (diff)
downloadffmpeg-51ae2142d5ec6c00621f662631b6347bc1b2669c.tar.gz
Fix palette copying in av_picture_copy(). Previous code worked only if
linesize[1] == 1, which does not make sense. Originally committed as revision 20503 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/imgconvert.c')
-rw-r--r--libavcodec/imgconvert.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c
index a5fcb53fac..068e933ece 100644
--- a/libavcodec/imgconvert.c
+++ b/libavcodec/imgconvert.c
@@ -1184,9 +1184,7 @@ void av_picture_copy(AVPicture *dst, const AVPicture *src,
src->data[0], src->linesize[0],
width, height);
/* copy the palette */
- ff_img_copy_plane(dst->data[1], dst->linesize[1],
- src->data[1], src->linesize[1],
- 4, 256);
+ memcpy(dst->data[1], src->data[1], 4*256);
break;
}
}