[FFmpeg-cvslog] lavc/mediacodecdec: remove mediacodec_process_data() indirection
Matthieu Bouron
git at videolan.org
Sat Jan 6 23:14:02 EET 2018
ffmpeg | branch: master | Matthieu Bouron <matthieu.bouron at gmail.com> | Wed Jan 3 13:10:58 2018 +0100| [d19174c673b8788de825a936d8d7c9340aefcd56] | committer: Matthieu Bouron
lavc/mediacodecdec: remove mediacodec_process_data() indirection
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d19174c673b8788de825a936d8d7c9340aefcd56
---
libavcodec/mediacodecdec.c | 11 +----------
1 file changed, 1 insertion(+), 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;
More information about the ffmpeg-cvslog
mailing list