diff options
| author | Vladimir Voroshilov <voroshil@gmail.com> | 2008-04-19 17:07:58 +0000 |
|---|---|---|
| committer | Vladimir Voroshilov <voroshil@gmail.com> | 2008-04-19 17:07:58 +0000 |
| commit | 159ef4b02a231259da95af3e7384c216f3252abd (patch) | |
| tree | c353288c9ac9108377c2ce68b0094b9907ed8f52 /libavcodec/h264.c | |
| parent | c6cd525aa0b88a593ccb8c492f9a6a0a5c8abc86 (diff) | |
| download | ffmpeg-159ef4b02a231259da95af3e7384c216f3252abd.tar.gz | |
Implement FFMAX3(a,b,c) - maximum over three arguments.
Originally committed as revision 12910 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/h264.c')
| -rw-r--r-- | libavcodec/h264.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index a1d4b0dfe3..219c6875fe 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -6502,7 +6502,7 @@ static void filter_mb( H264Context *h, int mb_x, int mb_y, uint8_t *img_y, uint8 //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) |