diff options
| author | Paul B Mahol <onemda@gmail.com> | 2016-01-31 17:40:55 +0100 |
|---|---|---|
| committer | Paul B Mahol <onemda@gmail.com> | 2016-02-01 13:12:27 +0100 |
| commit | 75f3e5e082264010020099a06111c5dcfae68c98 (patch) | |
| tree | 8a3438dcc6e978703c8be8ca2ba830af49143885 | |
| parent | 0a7379d9cfc03e95461b5fc5eec01c3fc9ddba4b (diff) | |
| download | ffmpeg-75f3e5e082264010020099a06111c5dcfae68c98.tar.gz | |
avdevice/lavfi: replace deprecated avpicture_layout
Signed-off-by: Paul B Mahol <onemda@gmail.com>
| -rw-r--r-- | libavdevice/lavfi.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/libavdevice/lavfi.c b/libavdevice/lavfi.c index 077879edc8..b7bc983ed4 100644 --- a/libavdevice/lavfi.c +++ b/libavdevice/lavfi.c @@ -382,7 +382,6 @@ static int lavfi_read_packet(AVFormatContext *avctx, AVPacket *pkt) double min_pts = DBL_MAX; int stream_idx, min_pts_sink_idx = 0; AVFrame *frame = lavfi->decoded_frame; - AVPicture pict; AVDictionary *frame_metadata; int ret, i; int size = 0; @@ -435,11 +434,8 @@ static int lavfi_read_packet(AVFormatContext *avctx, AVPacket *pkt) if ((ret = av_new_packet(pkt, size)) < 0) return ret; - memcpy(pict.data, frame->data, 4*sizeof(frame->data[0])); - memcpy(pict.linesize, frame->linesize, 4*sizeof(frame->linesize[0])); - - avpicture_layout(&pict, frame->format, frame->width, frame->height, - pkt->data, size); + av_image_copy_to_buffer(pkt->data, size, (const uint8_t **)frame->data, frame->linesize, + frame->format, frame->width, frame->height, 1); } else if (av_frame_get_channels(frame) /* FIXME test audio */) { size = frame->nb_samples * av_get_bytes_per_sample(frame->format) * av_frame_get_channels(frame); |