virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Merge commit 'eec93e57096aa4804862d62760442380c70d489b'

Browse Source 
* commit 'eec93e57096aa4804862d62760442380c70d489b':
  libopenh264dec: Use a newer decoding entry point function

Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2019-02-20 15:43:30 -03:00
commit f05f210526
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/libopenh264dec.c
View File

@ -109,10 +109,18 @@ static int svc_decode_frame(AVCodecContext *avctx, void *data,
#endif #endif
} else { } else {
info.uiInBsTimeStamp = avpkt->pts; info.uiInBsTimeStamp = avpkt->pts;
#if OPENH264_VER_AT_LEAST(1, 4)
// Contrary to the name, DecodeFrameNoDelay actually does buffering
// and reordering of frames, and is the recommended decoding entry
// point since 1.4. This is essential for successfully decoding
// B-frames.
state = (*s->decoder)->DecodeFrameNoDelay(s->decoder, avpkt->data, avpkt->size, ptrs, &info);
#else
state = (*s->decoder)->DecodeFrame2(s->decoder, avpkt->data, avpkt->size, ptrs, &info); state = (*s->decoder)->DecodeFrame2(s->decoder, avpkt->data, avpkt->size, ptrs, &info);
#endif
} }
if (state != dsErrorFree) { if (state != dsErrorFree) {
av_log(avctx, AV_LOG_ERROR, "DecodeFrame2 failed\n"); av_log(avctx, AV_LOG_ERROR, "DecodeFrame failed\n");
return AVERROR_UNKNOWN; return AVERROR_UNKNOWN;
} }
if (info.iBufferStatus != 1) { if (info.iBufferStatus != 1) {