diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-22 20:02:33 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-22 20:02:33 +0200 |
| commit | 6d34ab1a08c055cc9fffc1553e8e8eee3f07f90f (patch) | |
| tree | 426b635b53018e5633b7afffc290d0529dc18584 /libavcodec/rawenc.c | |
| parent | d3cc258a6167bfb35d2add761d7d7912f1cd085f (diff) | |
| parent | fcc1280acb6e6f682b34c2101b075b82f83d71ba (diff) | |
| download | ffmpeg-6d34ab1a08c055cc9fffc1553e8e8eee3f07f90f.tar.gz | |
Merge commit 'fcc1280acb6e6f682b34c2101b075b82f83d71ba'
* commit 'fcc1280acb6e6f682b34c2101b075b82f83d71ba':
rawenc: Replace avpicture functions with imgutils
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/rawenc.c')
| -rw-r--r-- | libavcodec/rawenc.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/libavcodec/rawenc.c b/libavcodec/rawenc.c index c23225fe60..b8eabd809a 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) @@ -49,15 +50,18 @@ FF_ENABLE_DEPRECATION_WARNINGS static int raw_encode(AVCodecContext *avctx, AVPacket *pkt, const AVFrame *frame, int *got_packet) { - int ret = avpicture_get_size(frame->format, frame->width, frame->height); + int ret = av_image_get_buffer_size(frame->format, + frame->width, frame->height, 1); if (ret < 0) return ret; if ((ret = ff_alloc_packet2(avctx, pkt, ret, ret)) < 0) return ret; - if ((ret = avpicture_layout((const AVPicture *)frame, frame->format, frame->width, - frame->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 && |