summaryrefslogtreecommitdiff
path: root/libavcodec/imgconvert.c
diff options
context:
space:
mode:
authorStefano Sabatini <stefano.sabatini-lala@poste.it>2010-09-07 21:23:55 +0000
committerStefano Sabatini <stefano.sabatini-lala@poste.it>2010-09-07 21:23:55 +0000
commit34017fd9b2a2a74f6b985f1ce3c5f66429f034ad (patch)
tree45e04064fccb76860adab72bacf12ba108d84ad1 /libavcodec/imgconvert.c
parente7eb2033ffcddfa38457cba96477e15e91fbb4d1 (diff)
Move av_picture_data_copy() to libavcore, and rename it
av_image_copy(). Originally committed as revision 25067 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/imgconvert.c')
-rw-r--r--libavcodec/imgconvert.c34
1 files changed, 4 insertions, 30 deletions
diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c
index 4c4bdb9212..43b50d3f31 100644
--- a/libavcodec/imgconvert.c
+++ b/libavcodec/imgconvert.c
@@ -793,46 +793,20 @@ int ff_get_plane_bytewidth(enum PixelFormat pix_fmt, int width, int plane)
{
return av_image_get_linesize(pix_fmt, width, plane);
}
-#endif
void av_picture_data_copy(uint8_t *dst_data[4], int dst_linesize[4],
uint8_t *src_data[4], int src_linesize[4],
enum PixelFormat pix_fmt, int width, int height)
{
- const AVPixFmtDescriptor *desc = &av_pix_fmt_descriptors[pix_fmt];
-
- if (desc->flags & PIX_FMT_HWACCEL)
- return;
-
- if (desc->flags & PIX_FMT_PAL) {
- av_image_copy_plane(dst_data[0], dst_linesize[0],
- src_data[0], src_linesize[0],
- width, height);
- /* copy the palette */
- memcpy(dst_data[1], src_data[1], 4*256);
- } else {
- int i, planes_nb = 0;
-
- for (i = 0; i < desc->nb_components; i++)
- planes_nb = FFMAX(planes_nb, desc->comp[i].plane + 1);
-
- for (i = 0; i < planes_nb; i++) {
- int h = height;
- int bwidth = av_image_get_linesize(pix_fmt, width, i);
- if (i == 1 || i == 2) {
- h= -((-height)>>desc->log2_chroma_h);
- }
- av_image_copy_plane(dst_data[i], dst_linesize[i],
- src_data[i], src_linesize[i],
- bwidth, h);
- }
- }
+ av_image_copy(dst_data, dst_linesize, src_data, src_linesize,
+ pix_fmt, width, height);
}
+#endif
void av_picture_copy(AVPicture *dst, const AVPicture *src,
enum PixelFormat pix_fmt, int width, int height)
{
- av_picture_data_copy(dst->data, dst->linesize, src->data,
+ av_image_copy(dst->data, dst->linesize, src->data,
src->linesize, pix_fmt, width, height);
}