virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

avcodec/decode: Remove always-true check

Browse Source 
Forgotten in 1fd7627770.

Reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt
2021-03-12 17:29:28 +01:00
parent d025a5bcc2
commit cc448f8d39
1 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/decode.c
View File

@@ -1744,7 +1744,6 @@ int ff_decode_frame_props(AVCodecContext *avctx, AVFrame *frame)
av_fifo_generic_read(avctx->internal->pkt_props, av_fifo_generic_read(avctx->internal->pkt_props,
pkt, sizeof(*pkt), NULL); pkt, sizeof(*pkt), NULL);
if (pkt) {
frame->pts = pkt->pts; frame->pts = pkt->pts;
#if FF_API_PKT_PTS #if FF_API_PKT_PTS
FF_DISABLE_DEPRECATION_WARNINGS FF_DISABLE_DEPRECATION_WARNINGS
@@ -1775,7 +1774,6 @@ FF_ENABLE_DEPRECATION_WARNINGS
} else { } else {
frame->flags = (frame->flags & ~AV_FRAME_FLAG_DISCARD); frame->flags = (frame->flags & ~AV_FRAME_FLAG_DISCARD);
} }
}
frame->reordered_opaque = avctx->reordered_opaque; frame->reordered_opaque = avctx->reordered_opaque;
if (frame->color_primaries == AVCOL_PRI_UNSPECIFIED) if (frame->color_primaries == AVCOL_PRI_UNSPECIFIED)