diff options
| author | Martin Storsjö <martin@martin.st> | 2016-06-24 01:13:16 +0300 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2016-06-24 22:30:54 +0300 |
| commit | 0c9c4004ed57de210b4d83c7b39bbfb00b86b9af (patch) | |
| tree | d6fb874a835b952d521bdf3c928dcc8945f2134e | |
| parent | 31aa5335c390c83a6c3ea955b155067c36c4a2c4 (diff) | |
| download | ffmpeg-0c9c4004ed57de210b4d83c7b39bbfb00b86b9af.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.
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 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 |