[FFmpeg-cvslog] omx: Don't return > 0 from omx_encode_frame

Martin Storsjö git at videolan.org
Sat Jun 25 21:55:56 CEST 2016


ffmpeg | branch: master | Martin Storsjö <martin at martin.st> | Fri Jun 24 01:13:16 2016 +0300| [a590d344e3164f5616d0fe85daee45dd834c4841] | committer: Michael Niedermayer

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.

Reviewed-by: Jan Gerber <j at v2v.cc>
Signed-off-by: Martin Storsjö <martin at martin.st>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a590d344e3164f5616d0fe85daee45dd834c4841
---

 libavcodec/omx.c |    1 -
 1 file changed, 1 deletion(-)

diff --git a/libavcodec/omx.c b/libavcodec/omx.c
index 9de9f8c..1b2ae0d 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



More information about the ffmpeg-cvslog mailing list