Mercurial > libavcodec.hg

diff h264.c @ 6655:22cca5d3173a libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Implement FFMAX3(a,b,c) - maximum over three arguments.
author voroshil
date Sat, 19 Apr 2008 17:07:58 +0000
parents e226f34ca284
children 5df0c730234d
line wrap: on
line diff
--- a/h264.c	Sat Apr 19 13:03:12 2008 +0000
+++ b/h264.c	Sat Apr 19 17:07:58 2008 +0000
@@ -6502,7 +6502,7 @@
     //for sufficiently low qp, filtering wouldn't do anything
     //this is a conservative estimate: could also check beta_offset and more accurate chroma_qp
     if(!FRAME_MBAFF){
-        int qp_thresh = 15 - h->slice_alpha_c0_offset - FFMAX(0, FFMAX(h->pps.chroma_qp_index_offset[0], h->pps.chroma_qp_index_offset[1]));
+        int qp_thresh = 15 - h->slice_alpha_c0_offset - FFMAX3(0, h->pps.chroma_qp_index_offset[0], h->pps.chroma_qp_index_offset[1]);
         int qp = s->current_picture.qscale_table[mb_xy];
         if(qp <= qp_thresh
            && (mb_x == 0 || ((qp + s->current_picture.qscale_table[mb_xy-1] + 1)>>1) <= qp_thresh)