This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch release/6.1 in repository ffmpeg.
commit c13d2d1152ad5e4461edfab445e043f244ce379d Author: Kacper Michajłow <[email protected]> AuthorDate: Thu Jul 30 17:25:52 2026 +0200 Commit: ffmpeg-devel <[email protected]> CommitDate: Fri Aug 14 12:40:58 2026 +0000 avcodec/h264_direct: move check before loading things (cherry picked from commit 029c80900e2b92a8495e36aa19d7fac9c55b8482) --- libavcodec/h264_direct.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/h264_direct.c b/libavcodec/h264_direct.c index 09e38ccc8e..c1495c9cdf 100644 --- a/libavcodec/h264_direct.c +++ b/libavcodec/h264_direct.c @@ -184,13 +184,13 @@ void ff_h264_direct_ref_list_init(const H264Context *const h, H264SliceContext * static void await_reference_mb_row(const H264Context *const h, H264Ref *ref, int mb_y) { + if (!HAVE_THREADS || !(h->avctx->active_thread_type & FF_THREAD_FRAME)) + return; + int ref_field = ref->reference - 1; int ref_field_picture = ref->parent->field_picture; int ref_height = 16 * h->mb_height >> ref_field_picture; - if (!HAVE_THREADS || !(h->avctx->active_thread_type & FF_THREAD_FRAME)) - return; - /* FIXME: It can be safe to access mb stuff * even if pixels aren't deblocked yet. */ _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
