[FFmpeg-cvslog] r21244 - trunk/libavcodec/h264.c

[michael]

Author: michael
Date: Sat Jan 16 14:12:11 2010
New Revision: 21244

Log:
Consider slice_beta_offet in qp_thresh.

Modified:
   trunk/libavcodec/h264.c

Modified: trunk/libavcodec/h264.c
==============================================================================
--- trunk/libavcodec/h264.c	Sat Jan 16 12:55:35 2010	(r21243)
+++ trunk/libavcodec/h264.c	Sat Jan 16 14:12:11 2010	(r21244)
@@ -2110,7 +2110,7 @@ static int decode_slice_header(H264Conte
                 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)