Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							325f6e0a97 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'qatar/master'  
						
						... 
						
						
						
						* qatar/master:
  lavfi: do not export the filters from shared objects
Conflicts:
	libavfilter/af_amix.c
	libavfilter/af_anull.c
	libavfilter/asrc_anullsrc.c
	libavfilter/f_select.c
	libavfilter/f_settb.c
	libavfilter/split.c
	libavfilter/src_movie.c
	libavfilter/vf_aspect.c
	libavfilter/vf_blackframe.c
	libavfilter/vf_colorbalance.c
	libavfilter/vf_copy.c
	libavfilter/vf_crop.c
	libavfilter/vf_cropdetect.c
	libavfilter/vf_drawbox.c
	libavfilter/vf_format.c
	libavfilter/vf_framestep.c
	libavfilter/vf_frei0r.c
	libavfilter/vf_hflip.c
	libavfilter/vf_libopencv.c
	libavfilter/vf_lut.c
	libavfilter/vf_null.c
	libavfilter/vf_overlay.c
	libavfilter/vf_scale.c
	libavfilter/vf_transpose.c
	libavfilter/vf_unsharp.c
	libavfilter/vf_vflip.c
Merged-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2013-10-29 11:58:11 +01:00 
						 
				 
			
				
					
						
							
							
								Anton Khirnov 
							
						 
					 
					
						
						
						
						
							
						
						
							cd43ca0443 
							
						 
					 
					
						
						
							
							lavfi: do not export the filters from shared objects  
						
						
						
						
					 
					
						2013-10-28 15:29:54 +01:00 
						 
				 
			
				
					
						
							
							
								Paul B Mahol 
							
						 
					 
					
						
						
						
						
							
						
						
							b211607b5c 
							
						 
					 
					
						
						
							
							avfilter: various cosmetics  
						
						... 
						
						
						
						Signed-off-by: Paul B Mahol <onemda@gmail.com> 
						
						
					 
					
						2013-09-12 14:01:43 +00:00 
						 
				 
			
				
					
						
							
							
								Thilo Borgmann 
							
						 
					 
					
						
						
						
						
							
						
						
							d814a839ac 
							
						 
					 
					
						
						
							
							Reinstate proper FFmpeg license for all files.  
						
						
						
						
					 
					
						2013-08-30 15:47:38 +00:00 
						 
				 
			
				
					
						
							
							
								Anton Khirnov 
							
						 
					 
					
						
						
						
						
							
						
						
							4fa1f52e33 
							
						 
					 
					
						
						
							
							af_resample: switch to an AVOptions-based system.  
						
						
						
						
					 
					
						2013-04-09 18:45:50 +02:00 
						 
				 
			
				
					
						
							
							
								Anton Khirnov 
							
						 
					 
					
						
						
						
						
							
						
						
							7e350379f8 
							
						 
					 
					
						
						
							
							lavfi: switch to AVFrame.  
						
						... 
						
						
						
						Deprecate AVFilterBuffer/AVFilterBufferRef and everything related to it
and use AVFrame instead. 
						
						
					 
					
						2013-03-08 07:37:18 +01:00 
						 
				 
			
				
					
						
							
							
								Justin Ruggles 
							
						 
					 
					
						
						
						
						
							
						
						
							9f1223562e 
							
						 
					 
					
						
						
							
							lavfi: connect libavresample options to af_resample via AVFilterGraph  
						
						
						
						
					 
					
						2013-02-23 17:07:54 -05:00 
						 
				 
			
				
					
						
							
							
								Anton Khirnov 
							
						 
					 
					
						
						
						
						
							
						
						
							565e4993c6 
							
						 
					 
					
						
						
							
							lavfi: merge start_frame/draw_slice/end_frame  
						
						... 
						
						
						
						Any alleged performance benefits gained from the split are purely
mythological and do not justify added code complexity. 
						
						
					 
					
						2012-11-28 08:50:19 +01:00 
						 
				 
			
				
					
						
							
							
								Mans Rullgard 
							
						 
					 
					
						
						
						
						
							
						
						
							568c70e79e 
							
						 
					 
					
						
						
							
							lavfi: convert input/ouput list compound literals to named objects  
						
						... 
						
						
						
						A number of compilers, for example those from TI and IBM, choke on
these initialisers.  The current style is also quite ugly.
Signed-off-by: Mans Rullgard <mans@mansr.com> 
						
						
					 
					
						2012-10-10 22:26:12 +01:00 
						 
				 
			
				
					
						
							
							
								Janne Grunau 
							
						 
					 
					
						
						
						
						
							
						
						
							ac9a89562a 
							
						 
					 
					
						
						
							
							af_resample: unref out_buf when avresample_convert returns 0  
						
						... 
						
						
						
						Fixes CID732273. 
						
						
					 
					
						2012-10-09 18:43:30 +02:00 
						 
				 
			
				
					
						
							
							
								Justin Ruggles 
							
						 
					 
					
						
						
						
						
							
						
						
							7b556be673 
							
						 
					 
					
						
						
							
							af_resample: avoid conversion of identical sample formats for 1 channel  
						
						... 
						
						
						
						When there is only 1 channel, the planar and interleaved formats of the same
data type should be treated as identical. 
						
						
					 
					
						2012-10-07 16:45:50 -04:00 
						 
				 
			
				
					
						
							
							
								Anton Khirnov 
							
						 
					 
					
						
						
						
						
							
						
						
							e7ba5b1de0 
							
						 
					 
					
						
						
							
							lavr: change the type of the data buffers to uint8_t**.  
						
						... 
						
						
						
						This is more consistent with what the rest of Libav does.
This breaks API. 
						
						
					 
					
						2012-10-05 13:49:44 +02:00 
						 
				 
			
				
					
						
							
							
								Martin Storsjö 
							
						 
					 
					
						
						
						
						
							
						
						
							1d9c2dc89a 
							
						 
					 
					
						
						
							
							Don't include common.h from avutil.h  
						
						... 
						
						
						
						Signed-off-by: Martin Storsjö <martin@martin.st> 
						
						
					 
					
						2012-08-15 22:32:06 +03:00 
						 
				 
			
				
					
						
							
							
								Anton Khirnov 
							
						 
					 
					
						
						
						
						
							
						
						
							cd99146253 
							
						 
					 
					
						
						
							
							lavfi: add error handling to filter_samples().  
						
						
						
						
					 
					
						2012-07-09 08:25:19 +02:00 
						 
				 
			
				
					
						
							
							
								Anton Khirnov 
							
						 
					 
					
						
						
						
						
							
						
						
							1ffb645662 
							
						 
					 
					
						
						
							
							af_resample: fix request_frame() behavior.  
						
						... 
						
						
						
						Make sure that an output frame has really been produced before returning
0. 
						
						
					 
					
						2012-07-09 08:21:37 +02:00 
						 
				 
			
				
					
						
							
							
								Justin Ruggles 
							
						 
					 
					
						
						
						
						
							
						
						
							8ca08066fc 
							
						 
					 
					
						
						
							
							lavr: Use AV_SAMPLE_FMT_NONE to auto-select the internal sample format  
						
						... 
						
						
						
						Also make this the default value. 
						
						
					 
					
						2012-07-08 15:22:11 -04:00 
						 
				 
			
				
					
						
							
							
								Anton Khirnov 
							
						 
					 
					
						
						
						
						
							
						
						
							6c1e065bd4 
							
						 
					 
					
						
						
							
							lavfi: remove disabled FF_API_SAMPLERATE64 cruft  
						
						
						
						
					 
					
						2012-06-26 13:15:14 +02:00 
						 
				 
			
				
					
						
							
							
								Janne Grunau 
							
						 
					 
					
						
						
						
						
							
						
						
							fbc5740566 
							
						 
					 
					
						
						
							
							af_resample: fix format modifier in debug string for FF_API_SAMPLERATE64  
						
						
						
						
					 
					
						2012-06-15 19:10:58 +02:00 
						 
				 
			
				
					
						
							
							
								Anton Khirnov 
							
						 
					 
					
						
						
						
						
							
						
						
							803391f719 
							
						 
					 
					
						
						
							
							lavfi: remove request/poll and drawing functions from public API on next bump  
						
						... 
						
						
						
						They are only useful inside filters and we don't allow user filters for
now. 
						
						
					 
					
						2012-06-05 09:38:16 +02:00 
						 
				 
			
				
					
						
							
							
								Anton Khirnov 
							
						 
					 
					
						
						
						
						
							
						
						
							b74a1da49d 
							
						 
					 
					
						
						
							
							lavfi: make formats API private on next bump.  
						
						... 
						
						
						
						It is only useful inside filters and we don't allow user filters for
now. 
						
						
					 
					
						2012-06-05 09:37:30 +02:00 
						 
				 
			
				
					
						
							
							
								Justin Ruggles 
							
						 
					 
					
						
						
						
						
							
						
						
							e0d8427dce 
							
						 
					 
					
						
						
							
							af_resample: remove an extra space in the log output  
						
						
						
						
					 
					
						2012-05-21 18:26:51 -04:00 
						 
				 
			
				
					
						
							
							
								Anton Khirnov 
							
						 
					 
					
						
						
						
						
							
						
						
							ff1f51a8aa 
							
						 
					 
					
						
						
							
							lavfi: add channel layout/sample rate negotiation.  
						
						
						
						
					 
					
						2012-05-14 21:36:10 +02:00 
						 
				 
			
				
					
						
							
							
								Anton Khirnov 
							
						 
					 
					
						
						
						
						
							
						
						
							d371e7b988 
							
						 
					 
					
						
						
							
							lavfi: add lavr-based audio resampling filter.  
						
						
						
						
					 
					
						2012-05-12 18:09:28 +02:00