ffmpeg | branch: master | Luca Barbato <lu_z...@gentoo.org> | Wed Oct 14 11:33:19 2015 +0200| [fcc1280acb6e6f682b34c2101b075b82f83d71ba] | committer: Vittorio Giovara
rawenc: Replace avpicture functions with imgutils Signed-off-by: Vittorio Giovara <vittorio.giov...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fcc1280acb6e6f682b34c2101b075b82f83d71ba --- libavcodec/rawenc.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/libavcodec/rawenc.c b/libavcodec/rawenc.c index cc55b3a..60bd0c7 100644 --- a/libavcodec/rawenc.c +++ b/libavcodec/rawenc.c @@ -29,6 +29,7 @@ #include "internal.h" #include "libavutil/pixdesc.h" #include "libavutil/intreadwrite.h" +#include "libavutil/imgutils.h" #include "libavutil/internal.h" static av_cold int raw_encode_init(AVCodecContext *avctx) @@ -50,15 +51,18 @@ FF_ENABLE_DEPRECATION_WARNINGS static int raw_encode(AVCodecContext *avctx, AVPacket *pkt, const AVFrame *frame, int *got_packet) { - int ret = avpicture_get_size(avctx->pix_fmt, avctx->width, avctx->height); + int ret = av_image_get_buffer_size(avctx->pix_fmt, + avctx->width, avctx->height, 1); if (ret < 0) return ret; if ((ret = ff_alloc_packet(pkt, ret)) < 0) return ret; - if ((ret = avpicture_layout((const AVPicture *)frame, avctx->pix_fmt, avctx->width, - avctx->height, pkt->data, pkt->size)) < 0) + if ((ret = av_image_copy_to_buffer(pkt->data, pkt->size, + frame->data, frame->linesize, + frame->format, + frame->width, frame->height, 1)) < 0) return ret; if(avctx->codec_tag == AV_RL32("yuv2") && ret > 0 && _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
