diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2010-01-16 13:12:11 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2010-01-16 13:12:11 +0000 |
| commit | 4c568cbcac8cead0b5d2f533012dc3eb9df7bfee (patch) | |
| tree | 64aa846f1778bccebd261e6e2e26cf764c093d89 | |
| parent | 2e36c931f0e8d9fe812badd4dee90fdd352c05be (diff) | |
Consider slice_beta_offet in qp_thresh.
Originally committed as revision 21244 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -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 3cec4182ec..cb9bd68fea 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -2110,7 +2110,7 @@ static int decode_slice_header(H264Context *h, H264Context *h0){ 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) |