virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-13 21:28:01 +02:00
Code Issues Releases Activity

omx: Don't return > 0 from omx_encode_frame

Browse Source 
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>
This commit is contained in:
Martin Storsjö 2016-06-24 01:13:16 +03:00
parent 31aa5335c3
commit 0c9c4004ed
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavcodec/omx.c
View File

@ -845,7 +845,6 @@ static int omx_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
s->output_buf_size = 0; s->output_buf_size = 0;
} }
if (buffer->nFlags & OMX_BUFFERFLAG_ENDOFFRAME) { 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); 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 // We don't currently enable B-frames for the encoders, so set
// pkt->dts = pkt->pts. (The calling code behaves worse if the encoder // pkt->dts = pkt->pts. (The calling code behaves worse if the encoder