2368d08e701acf7942bf6d70a40a3e70186199ea
				
			
			
		
	* commit 'e22ebd04bcab7f86548794556c28ecca46d9c2ac':
  hevc: Bound check cu_qp_delta
Conflicts:
	libavcodec/hevc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit a69dd1163b)
Conflicts:
	libavcodec/hevc.c
		
	
FFmpeg README ------------- 1) Documentation ---------------- * Read the documentation in the doc/ directory in git. You can also view it online at http://ffmpeg.org/documentation.html 2) Licensing ------------ * See the LICENSE file. 3) Build and Install -------------------- * See the INSTALL file.
Description
				
					Languages
				
				
								
								
									C
								
								92.1%
							
						
							
								
								
									Assembly
								
								6%
							
						
							
								
								
									Makefile
								
								1.2%
							
						
							
								
								
									C++
								
								0.3%
							
						
							
								
								
									Objective-C
								
								0.2%
							
						
							
								
								
									Other
								
								0.1%