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

Merge commit 'fcc1280acb6e6f682b34c2101b075b82f83d71ba' 

* commit 'fcc1280acb6e6f682b34c2101b075b82f83d71ba':
  rawenc: Replace avpicture functions with imgutils

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
Hendrik Leppkes 2015-10-22 20:02:33 +02:00
parent d3cc258a61 fcc1280acb
commit 6d34ab1a08
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)
@ -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 &&