From 4279e0e8d09a3e988d38d550265e4c94402b72b0 Mon Sep 17 00:00:00 2001 From: Luca Barbato Date: Sat, 22 Feb 2014 11:19:03 +0100 Subject: [PATCH] h264: Fix a typo from the previous commit f777504f640260337974848c7d5d7a3f064bbb45 changed a - in + CC: libav-stable@libav.org (cherry picked from commit d922c5a5fbaf0b6c73bd8c81ae059bc6e406961c) (cherry picked from commit 3ce77e04c2ca4b9e7fa6b94b51e8d7c5f188da86) (cherry picked from commit 8cba6f58c8acaa0ca6749110a2746bbe60ff2dab) --- libavcodec/h264.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/h264.c b/libavcodec/h264.c index f3094b51cf..ba8872cc5f 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -3275,7 +3275,7 @@ static int decode_slice_header(H264Context *h, H264Context *h0){ } } } - h->qp_thresh = 15 + + h->qp_thresh = 15 - FFMIN(h->slice_alpha_c0_offset, h->slice_beta_offset) - FFMAX3(0, h->pps.chroma_qp_index_offset[0],