* qatar/master: ulti: Fix invalid reads lavf: dealloc private options in av_write_trailer yadif: support 10bit YUV vc1: mark with ER_MB_ERROR bits overconsumption lavc: introduce ER_MB_END and ER_MB_ERROR error_resilience: use the ER_ namespace build: move inclusion of subdir.mak to main subdir loop rv34: NEON optimised 4x4 dequant rv34: move 4x4 dequant to RV34DSPContext aacdec: Use intfloat.h rather than local punning union. Conflicts: libavcodec/h264.c libavcodec/vc1dec.c libavfilter/vf_yadif.c libavformat/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
		
			
				
	
	
		
			9 lines
		
	
	
		
			111 B
		
	
	
	
		
			Makefile
		
	
	
	
	
	
			
		
		
	
	
			9 lines
		
	
	
		
			111 B
		
	
	
	
		
			Makefile
		
	
	
	
	
	
| include $(SUBDIR)../config.mak
 | |
| 
 | |
| NAME = postproc
 | |
| FFLIBS = avutil
 | |
| 
 | |
| HEADERS = postprocess.h
 | |
| 
 | |
| OBJS = postprocess.o
 |