diff options
| author | Martin Storsjö <martin@martin.st> | 2016-06-24 01:13:16 +0300 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-06-25 21:39:17 +0200 |
| commit | a590d344e3164f5616d0fe85daee45dd834c4841 (patch) | |
| tree | ed1335ac3d5c7f0dcb1102a4d4e2b62b5ab8be10 | |
| parent | 4cc896ea5f06f8b1ebcde6d876d9c5b59ef9a016 (diff) | |
| download | ffmpeg-a590d344e3164f5616d0fe85daee45dd834c4841.tar.gz | |
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@v2v.cc>
Signed-off-by: Martin Storsjö <martin@martin.st>
| -rw-r--r-- | libavcodec/omx.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/omx.c b/libavcodec/omx.c index 9de9f8cc57..1b2ae0d997 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 |