RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

rawenc: Replace avpicture functions with imgutils 

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
This commit is contained in:
Luca Barbato 2015-10-14 11:33:19 +02:00 committed by Vittorio Giovara
parent 3496cec433
commit fcc1280acb
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/rawenc.c
View File

@ -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 &&