From: Matthieu Bouron Date: Thu, 26 May 2016 13:33:41 +0000 (+0200) Subject: lavc/mediacodecdec_h264: rename input_ref to input_pkt X-Git-Tag: android-x86-7.1-r1~5041 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=12f47539ca7310382d0b26c729a6628d6bb9faea;p=android-x86%2Fexternal-ffmpeg.git lavc/mediacodecdec_h264: rename input_ref to input_pkt --- diff --git a/libavcodec/mediacodecdec_h264.c b/libavcodec/mediacodecdec_h264.c index ce9ca46d23..52e48aecb3 100644 --- a/libavcodec/mediacodecdec_h264.c +++ b/libavcodec/mediacodecdec_h264.c @@ -257,19 +257,19 @@ static int mediacodec_decode_frame(AVCodecContext *avctx, void *data, /* buffer the input packet */ if (avpkt->size) { - AVPacket input_ref = { 0 }; + AVPacket input_pkt = { 0 }; - if (av_fifo_space(s->fifo) < sizeof(input_ref)) { + if (av_fifo_space(s->fifo) < sizeof(input_pkt)) { ret = av_fifo_realloc2(s->fifo, - av_fifo_size(s->fifo) + sizeof(input_ref)); + av_fifo_size(s->fifo) + sizeof(input_pkt)); if (ret < 0) return ret; } - ret = av_packet_ref(&input_ref, avpkt); + ret = av_packet_ref(&input_pkt, avpkt); if (ret < 0) return ret; - av_fifo_generic_write(s->fifo, &input_ref, sizeof(input_ref), NULL); + av_fifo_generic_write(s->fifo, &input_pkt, sizeof(input_pkt), NULL); } /* process buffered data */