summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorMatthieu Bouron <matthieu.bouron@gmail.com>2018-01-03 13:10:58 +0100
committerMatthieu Bouron <matthieu.bouron@gmail.com>2018-01-06 22:12:51 +0100
commitd19174c673b8788de825a936d8d7c9340aefcd56 (patch)
treebdfaf86a93f3ba244022c0a866b56bd4ffd48f31 /libavcodec
parent9d9835017f67db7e37b6b5a42a247e17b05bf8fc (diff)
lavc/mediacodecdec: remove mediacodec_process_data() indirection
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/mediacodecdec.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/libavcodec/mediacodecdec.c b/libavcodec/mediacodecdec.c
index 35a9e34861..6c5d3ddd79 100644
--- a/libavcodec/mediacodecdec.c
+++ b/libavcodec/mediacodecdec.c
@@ -416,15 +416,6 @@ done:
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)
{
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);
}
- 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)
return ret;