Mercurial > libavcodec.hg

changeset 10897:d23f1c47fc09 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Consider slice_beta_offet in qp_thresh.
author michael
date Sat, 16 Jan 2010 13:12:11 +0000
parents f112b4d030fa
children 71fccf5aa7e3
files h264.c
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/h264.c	Sat Jan 16 11:55:35 2010 +0000
+++ b/h264.c	Sat Jan 16 13:12:11 2010 +0000
@@ -2110,7 +2110,7 @@
                 return 1; // deblocking switched inside frame
         }
     }
-    h->qp_thresh= 15 - h->slice_alpha_c0_offset - FFMAX3(0, h->pps.chroma_qp_index_offset[0], h->pps.chroma_qp_index_offset[1]);
+    h->qp_thresh= 15 - FFMIN(h->slice_alpha_c0_offset, h->slice_beta_offset) - FFMAX3(0, h->pps.chroma_qp_index_offset[0], h->pps.chroma_qp_index_offset[1]);
 
 #if 0 //FMO
     if( h->pps.num_slice_groups > 1  && h->pps.mb_slice_group_map_type >= 3 && h->pps.mb_slice_group_map_type <= 5)