Derek Buitenhuis 
							
						 
					 
					
						
						
							
						
						21f9468402 
					 
					
						
						
							
							avutil: Rename FF_CEIL_COMPAT to AV_CEIL_COMPAT  
						
						... 
						
						
						
						Libav, for some reason, merged this as a public API function. This will
aid in future merges.
A define is left for backwards compat, just in case some person
used it, since it is in a public header.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com > 
						
						
					 
					
						2016-01-27 16:36:46 +00:00 
						 
				 
			
				
					
						
							
							
								Ganesh Ajjanagadde 
							
						 
					 
					
						
						
							
						
						6aaac24d72 
					 
					
						
						
							
							avfilter/all: propagate errors of functions from avfilter/formats  
						
						... 
						
						
						
						Many of the functions from avfilter/formats can return errors, usually AVERROR(ENOMEM).
This propagates the return values.
All of these were found by using av_warn_unused_result, demonstrating its utility.
Tested with FATE. I am least sure of the changes to avfilter/filtergraph,
since I don't know what/how reduce_format is intended to behave and how it should
react to errors.
Fixes: CID 1325680, 1325679, 1325678.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Previous version Reviewed-by: Nicolas George <george@nsup.org >
Previous version Reviewed-by: Clément Bœsch <u@pkh.me >
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com > 
						
						
					 
					
						2015-10-14 10:04:01 -04:00 
						 
				 
			
				
					
						
							
							
								Clément Bœsch 
							
						 
					 
					
						
						
							
						
						a62bf26c28 
					 
					
						
						
							
							avfilter/il: use AV_OPT_TYPE_BOOL for {luma,chroma,alpha}_swap options  
						
						
						
						
					 
					
						2015-09-09 00:12:42 +02:00 
						 
				 
			
				
					
						
							
							
								Paul B Mahol 
							
						 
					 
					
						
						
							
						
						a0854c084e 
					 
					
						
						
							
							avfilter: handle error in query_formats() in bunch of filters  
						
						... 
						
						
						
						Signed-off-by: Paul B Mahol <onemda@gmail.com > 
						
						
					 
					
						2015-04-08 13:05:06 +00:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						ee17295d10 
					 
					
						
						
							
							avfilter/vf_il: Change enums to int, which are accessed via AVOption as int  
						
						... 
						
						
						
						This fixes depending on implementation defined behavior
Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2015-03-18 12:32:56 +01:00 
						 
				 
			
				
					
						
							
							
								Paul B Mahol 
							
						 
					 
					
						
						
							
						
						abcf8610b8 
					 
					
						
						
							
							avfitler/vf_il: use the name 's' for the pointer to the private context  
						
						... 
						
						
						
						Signed-off-by: Paul B Mahol <onemda@gmail.com > 
						
						
					 
					
						2015-01-28 14:22:26 +00:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						c0f8801e47 
					 
					
						
						
							
							avfilter/il: Avoid using non public AV_PIX_FMT_NB  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2014-05-27 17:44:02 +02: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 
						 
				 
			
				
					
						
							
							
								Paul B Mahol 
							
						 
					 
					
						
						
							
						
						b077d8d908 
					 
					
						
						
							
							avfilter: remove redundant .get_(audio/video)_buffer initializations  
						
						... 
						
						
						
						Signed-off-by: Paul B Mahol <onemda@gmail.com > 
						
						
					 
					
						2013-09-07 18:20:16 +00:00 
						 
				 
			
				
					
						
							
							
								Paul B Mahol 
							
						 
					 
					
						
						
							
						
						3554238863 
					 
					
						
						
							
							lavfi/il: add timeline support  
						
						... 
						
						
						
						Signed-off-by: Paul B Mahol <onemda@gmail.com > 
						
						
					 
					
						2013-06-06 17:44:54 +00:00 
						 
				 
			
				
					
						
							
							
								Paul B Mahol 
							
						 
					 
					
						
						
							
						
						2516b393d4 
					 
					
						
						
							
							lavfi/field, il, noise: use av_pix_fmt_count_planes()  
						
						... 
						
						
						
						Signed-off-by: Paul B Mahol <onemda@gmail.com > 
						
						
					 
					
						2013-05-24 12:53:23 +00:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						c7c71f95f8 
					 
					
						
						
							
							replace remaining PIX_FMT_* flags with AV_PIX_FMT_FLAG_*  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2013-05-15 11:23:14 +02:00 
						 
				 
			
				
					
						
							
							
								Clément Bœsch 
							
						 
					 
					
						
						
							
						
						50e66726a2 
					 
					
						
						
							
							lavfi: use ceil right shift for chroma width/height.  
						
						... 
						
						
						
						This should fix several issues with odd dimensions inputs.
lut, vflip, pad and crop video filters also need to be checked for such
issues. It's possible sws is also affected. 
						
						
					 
					
						2013-05-10 17:20:06 +02:00 
						 
				 
			
				
					
						
							
							
								Paul B Mahol 
							
						 
					 
					
						
						
							
						
						295ce83e2f 
					 
					
						
						
							
							lavfi/il: remove pointless store  
						
						... 
						
						
						
						Signed-off-by: Paul B Mahol <onemda@gmail.com > 
						
						
					 
					
						2013-04-16 21:45:34 +00:00 
						 
				 
			
				
					
						
							
							
								Matthieu Bouron 
							
						 
					 
					
						
						
							
						
						6f46403cb0 
					 
					
						
						
							
							lavfi/il: switch to AVOption-based system  
						
						
						
						
					 
					
						2013-04-11 00:31:25 +02:00 
						 
				 
			
				
					
						
							
							
								Paul B Mahol 
							
						 
					 
					
						
						
							
						
						9fce2b8854 
					 
					
						
						
							
							lavfi/il: use standard option parsing  
						
						... 
						
						
						
						Signed-off-by: Paul B Mahol <onemda@gmail.com > 
						
						
					 
					
						2013-04-08 12:10:37 +00: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 
						 
				 
			
				
					
						
							
							
								Stefano Sabatini 
							
						 
					 
					
						
						
							
						
						3acaea26e5 
					 
					
						
						
							
							lavfi/il: filter out hwaccels formats from the list of supported formats  
						
						
						
						
					 
					
						2013-02-10 21:00:56 +01:00 
						 
				 
			
				
					
						
							
							
								Stefano Sabatini 
							
						 
					 
					
						
						
							
						
						0b18965434 
					 
					
						
						
							
							lavfi/il: move query_formats() definition up  
						
						... 
						
						
						
						Respect order of call during the filter lifecycle, improve readability. 
						
						
					 
					
						2013-02-10 14:00:19 +01:00 
						 
				 
			
				
					
						
							
							
								Stefano Sabatini 
							
						 
					 
					
						
						
							
						
						63a9962287 
					 
					
						
						
							
							lavfi/il: simplify/generalize linesize computation  
						
						... 
						
						
						
						Rely on generic utilities for computing each plane linesize.
In particular, add support to NV12/21 formats and avoid use of
PIX_FMT_PLANAR pixdesc flag, whose semantics is questionable.
It also fixes various crashes. 
						
						
					 
					
						2013-02-10 14:00:19 +01:00 
						 
				 
			
				
					
						
							
							
								Paul B Mahol 
							
						 
					 
					
						
						
							
						
						969039eb6e 
					 
					
						
						
							
							lavfi/il: fix typo in Copyright  
						
						... 
						
						
						
						Signed-off-by: Paul B Mahol <onemda@gmail.com > 
						
						
					 
					
						2013-02-09 21:56:04 +00:00 
						 
				 
			
				
					
						
							
							
								Paul B Mahol 
							
						 
					 
					
						
						
							
						
						6e9abce5e2 
					 
					
						
						
							
							lavfi: port MP il filter  
						
						... 
						
						
						
						Signed-off-by: Paul B Mahol <onemda@gmail.com > 
						
						
					 
					
						2013-02-09 21:41:53 +00:00