[FFmpeg-soc] [soc]: r5939 - libavfilter/vf_overlay.c
stefano
subversion at mplayerhq.hu
Tue Oct 12 13:44:44 CEST 2010
Author: stefano
Date: Tue Oct 12 13:44:44 2010
New Revision: 5939
Log:
Use av_image_copy() in place of the deprecated av_picture_data_copy().
Modified:
libavfilter/vf_overlay.c
Modified: libavfilter/vf_overlay.c
==============================================================================
--- libavfilter/vf_overlay.c Tue Oct 12 13:42:53 2010 (r5938)
+++ libavfilter/vf_overlay.c Tue Oct 12 13:44:44 2010 (r5939)
@@ -24,6 +24,7 @@
*/
#include "avfilter.h"
+#include "libavcore/imgutils.h"
#include "libavutil/eval.h"
#include "libavutil/avstring.h"
@@ -221,9 +222,9 @@ static void copy_image_rgb(AVFilterBuffe
}
}
} else {
- av_picture_data_copy(dst->data, dst->linesize,
- src->data, src->linesize,
- dst->format, w, h);
+ av_image_copy(dst->data, dst->linesize,
+ src->data, src->linesize,
+ dst->format, w, h);
}
}
@@ -275,7 +276,7 @@ static void copy_image_yuv(AVFilterBuffe
copy_blended(dst_data[1], dst->linesize[1], src->data[1], src->linesize[1], src->data[3], src->linesize[3], chroma_w, chroma_h, hsub, vsub);
copy_blended(dst_data[2], dst->linesize[2], src->data[2], src->linesize[2], src->data[3], src->linesize[3], chroma_w, chroma_h, hsub, vsub);
} else {
- av_picture_data_copy(dst_data, dst->linesize, src->data, src->linesize, dst->format, w, h);
+ av_image_copy(dst_data, dst->linesize, src->data, src->linesize, dst->format, w, h);
}
}
More information about the FFmpeg-soc
mailing list