Stefano Sabatini 
							
						 
					 
					
						
						
							
						
						aade9884e9 
					 
					
						
						
							
							lavfi/apad: fix logic when whole_len or pad_len options are specified  
						
						... 
						
						
						
						In particular, allow pad_len and whole_len to have value set to 0, which
means that no padding will be added. Previously a value set to 0 meant
that that the filter had to pad forever.
The new semantics is clearer, also simplifies scripting since the option
value might be automatically computed, so that no checks need to be done
in case it is 0.
The old semantics was never documented and the logic was broken (the
filter was always adding samples indefinitely), so this should not break
backward compatibility. 
						
						
					 
					
						2014-08-21 16:59:07 +02:00 
						 
				 
			
				
					
						
							
							
								Stefano Sabatini 
							
						 
					 
					
						
						
							
						
						cb0524f7a0 
					 
					
						
						
							
							lavfi/apad: fix if_( style  
						
						
						
						
					 
					
						2014-08-20 12:35:16 +02:00 
						 
				 
			
				
					
						
							
							
								Paul B Mahol 
							
						 
					 
					
						
						
							
						
						9f2a3bcee7 
					 
					
						
						
							
							avfilter: remove superflous lines  
						
						... 
						
						
						
						Signed-off-by: Paul B Mahol <onemda@gmail.com > 
						
						
					 
					
						2014-02-26 16:37:59 +00:00 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								Paul B Mahol 
							
						 
					 
					
						
						
							
						
						b211607b5c 
					 
					
						
						
							
							avfilter: various cosmetics  
						
						... 
						
						
						
						Signed-off-by: Paul B Mahol <onemda@gmail.com > 
						
						
					 
					
						2013-09-12 14:01:43 +00:00 
						 
				 
			
				
					
						
							
							
								Clément Bœsch 
							
						 
					 
					
						
						
							
						
						1776177b7f 
					 
					
						
						
							
							lavfi: replace passthrough_filter_frame with a flag.  
						
						... 
						
						
						
						With the introduction of AVFilterContext->is_disabled, we can simplify
the custom passthrough mode in filters.
This commit is technically a small compat break, but the timeline was
introduced very recently.
Doxy by Stefano Sabatini. 
						
						
					 
					
						2013-05-12 13:07:47 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						1e1015f330 
					 
					
						
						
							
							avfilter/af_apad: Support AVFILTER_FLAG_SUPPORT_TIMELINE  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2013-05-08 23:55:06 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						fd6228e657 
					 
					
						
						
							
							lavfi: remove now unused args parameter from AVFilter.init and init_opaque  
						
						... 
						
						
						
						This is mostly automated global search and replace
The deprecated aconvert filter is disabled, if it still has users
it should be updated
Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2013-04-12 11:54:39 +02:00 
						 
				 
			
				
					
						
							
							
								Matthieu Bouron 
							
						 
					 
					
						
						
							
						
						a5ce5ac9fb 
					 
					
						
						
							
							lavfi/apad: switch to AVOption-based system  
						
						
						
						
					 
					
						2013-04-11 01:31:08 +02:00 
						 
				 
			
				
					
						
							
							
								Clément Bœsch 
							
						 
					 
					
						
						
							
						
						3ac77f67af 
					 
					
						
						
							
							lavfi/apad: use standard options parsing.  
						
						
						
						
					 
					
						2013-03-24 12:26:24 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						cd5f50a255 
					 
					
						
						
							
							avfilter: avoid direct access to AVFrame.channels  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2013-03-15 16:13:53 +01:00 
						 
				 
			
				
					
						
							
							
								Clément Bœsch 
							
						 
					 
					
						
						
							
						
						96e4b00d62 
					 
					
						
						
							
							lavfi: remove remaining forgotten min/rej perms.  
						
						
						
						
					 
					
						2013-03-10 02:38:21 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						a05a44e205 
					 
					
						
						
							
							Merge commit '7e350379f87e7f74420b4813170fe808e2313911'  
						
						... 
						
						
						
						* commit '7e350379f87e7f74420b4813170fe808e2313911':
  lavfi: switch to AVFrame.
Conflicts:
	doc/filters.texi
	libavfilter/af_ashowinfo.c
	libavfilter/audio.c
	libavfilter/avfilter.c
	libavfilter/avfilter.h
	libavfilter/buffersink.c
	libavfilter/buffersrc.c
	libavfilter/buffersrc.h
	libavfilter/f_select.c
	libavfilter/f_setpts.c
	libavfilter/fifo.c
	libavfilter/split.c
	libavfilter/src_movie.c
	libavfilter/version.h
	libavfilter/vf_aspect.c
	libavfilter/vf_bbox.c
	libavfilter/vf_blackframe.c
	libavfilter/vf_delogo.c
	libavfilter/vf_drawbox.c
	libavfilter/vf_drawtext.c
	libavfilter/vf_fade.c
	libavfilter/vf_fieldorder.c
	libavfilter/vf_fps.c
	libavfilter/vf_frei0r.c
	libavfilter/vf_gradfun.c
	libavfilter/vf_hqdn3d.c
	libavfilter/vf_lut.c
	libavfilter/vf_overlay.c
	libavfilter/vf_pad.c
	libavfilter/vf_scale.c
	libavfilter/vf_showinfo.c
	libavfilter/vf_transpose.c
	libavfilter/vf_vflip.c
	libavfilter/vf_yadif.c
	libavfilter/video.c
	libavfilter/vsrc_testsrc.c
	libavfilter/yadif.h
Following are notes about the merge authorship and various technical details.
Michael Niedermayer:
  * Main merge operation, notably avfilter.c and video.c
  * Switch to AVFrame:
    - afade
    - anullsrc
    - apad
    - aresample
    - blackframe
    - deshake
    - idet
    - il
    - mandelbrot
    - mptestsrc
    - noise
    - setfield
    - smartblur
    - tinterlace
  * various merge changes and fixes in:
    - ashowinfo
    - blackdetect
    - field
    - fps
    - select
    - testsrc
    - yadif
Nicolas George:
  * Switch to AVFrame:
    - make rawdec work with refcounted frames. Adapted from commit
      759001c534michaelni@gmx.at >
Signed-off-by: Nicolas George <nicolas.george@normalesup.org >
Signed-off-by: Clément Bœsch <ubitux@gmail.com >
Signed-off-by: Hendrik Leppkes <h.leppkes@gmail.com >
Signed-off-by: Matthieu Bouron <matthieu.bouron@gmail.com >
Signed-off-by: Stefano Sabatini <stefasab@gmail.com >
Merged-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2013-03-10 01:40:35 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						9700a7a1dd 
					 
					
						
						
							
							af_apad: remove unneeded av_opt_free  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2012-12-18 17:31:01 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						c311431e29 
					 
					
						
						
							
							apad: add whole_len and pad_len options.  
						
						... 
						
						
						
						These options allow padding to a specific length or adding a specific amount if silence.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2012-12-18 17:30:31 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						c2640146e0 
					 
					
						
						
							
							apad: fix apad_options formating  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2012-12-18 17:16:03 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						b7e085a288 
					 
					
						
						
							
							af_apad: add user setable packet_size  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2012-12-18 17:01:33 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						5eae7f8f35 
					 
					
						
						
							
							avfilter: add apad filter  
						
						... 
						
						
						
						This filter pads an audio stream with silence
It can together with -shortest be used to extend audio streams to
the same length as video.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2012-12-18 16:30:08 +01:00