virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-07-16 22:42:38 +02:00
Code Issues Releases Activity

lavc/mediacodecdec: remove mediacodec_process_data() indirection

Browse Source
This commit is contained in:
Matthieu Bouron
2018-01-03 13:10:58 +01:00
parent 9d9835017f
commit d19174c673
1 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/mediacodecdec.c
View File

@ -416,15 +416,6 @@ done:
return ret; return ret;
} }
static int mediacodec_process_data(AVCodecContext *avctx, AVFrame *frame,
int *got_frame, AVPacket *pkt)
{
MediaCodecH264DecContext *s = avctx->priv_data;
return ff_mediacodec_dec_decode(avctx, s->ctx, frame, got_frame, pkt);
}
static int mediacodec_receive_frame(AVCodecContext *avctx, AVFrame *frame) static int mediacodec_receive_frame(AVCodecContext *avctx, AVFrame *frame)
{ {
MediaCodecH264DecContext *s = avctx->priv_data; MediaCodecH264DecContext *s = avctx->priv_data;
@ -505,7 +496,7 @@ static int mediacodec_receive_frame(AVCodecContext *avctx, AVFrame *frame)
av_fifo_generic_read(s->fifo, &s->buffered_pkt, sizeof(s->buffered_pkt), NULL); av_fifo_generic_read(s->fifo, &s->buffered_pkt, sizeof(s->buffered_pkt), NULL);
} }
ret = mediacodec_process_data(avctx, frame, &got_frame, &s->buffered_pkt); ret = ff_mediacodec_dec_decode(avctx, s->ctx, frame, &got_frame, &s->buffered_pkt);
if (ret < 0) if (ret < 0)
return ret; return ret;