From: Martin Storsjö Date: Thu, 23 Jun 2016 22:13:16 +0000 (+0300) Subject: omx: Don't return > 0 from omx_encode_frame X-Git-Tag: n3.2~194^2~3 X-Git-Url: http://git.videolan.org/?p=ffmpeg.git;a=commitdiff_plain;h=0c9c4004ed57de210b4d83c7b39bbfb00b86b9af omx: Don't return > 0 from omx_encode_frame The encode function is supposed to just return 0 on success. This stems from a mixup with the return value of decode functions. Signed-off-by: Martin Storsjö --- diff --git a/libavcodec/omx.c b/libavcodec/omx.c index 63c7f5b422..0c61c2f536 100644 --- a/libavcodec/omx.c +++ b/libavcodec/omx.c @@ -845,7 +845,6 @@ static int omx_encode_frame(AVCodecContext *avctx, AVPacket *pkt, s->output_buf_size = 0; } if (buffer->nFlags & OMX_BUFFERFLAG_ENDOFFRAME) { - ret = pkt->size; pkt->pts = av_rescale_q(from_omx_ticks(buffer->nTimeStamp), AV_TIME_BASE_Q, avctx->time_base); // We don't currently enable B-frames for the encoders, so set // pkt->dts = pkt->pts. (The calling code behaves worse if the encoder