Merge commit '0d999333f96a34903448579bf13a3209deaee9da'
* commit '0d999333f96a34903448579bf13a3209deaee9da': hevc: Bound check slice_qp Conflicts: libavcodec/hevc.c See: aead772b5814142b0e530804486ff7970ecd9eef Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
		
						commit
						58f437c3f6
					
				@ -597,6 +597,7 @@ static int hls_slice_header(HEVCContext *s)
 | 
				
			|||||||
        }
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        sh->slice_qp_delta = get_se_golomb(gb);
 | 
					        sh->slice_qp_delta = get_se_golomb(gb);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        if (s->pps->pic_slice_level_chroma_qp_offsets_present_flag) {
 | 
					        if (s->pps->pic_slice_level_chroma_qp_offsets_present_flag) {
 | 
				
			||||||
            sh->slice_cb_qp_offset = get_se_golomb(gb);
 | 
					            sh->slice_cb_qp_offset = get_se_golomb(gb);
 | 
				
			||||||
            sh->slice_cr_qp_offset = get_se_golomb(gb);
 | 
					            sh->slice_cr_qp_offset = get_se_golomb(gb);
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user