Clément Bœsch 
							
						 
					 
					
						
						
							
						
						fd682b1892 
					 
					
						
						
							
							avfilter: handle error in query_formats() of a bunch of random video filters  
						
						
						
						
					 
					
						2015-03-16 23:43:12 +01:00 
						 
				 
			
				
					
						
							
							
								Stefano Sabatini 
							
						 
					 
					
						
						
							
						
						d055a1395c 
					 
					
						
						
							
							lavfi/hue: show first decimal value of saturation  
						
						
						
						
					 
					
						2013-12-20 19:25:42 +01:00 
						 
				 
			
				
					
						
							
							
								Stefano Sabatini 
							
						 
					 
					
						
						
							
						
						028d8dd367 
					 
					
						
						
							
							lavfi/hue: use av_clip_uint8() instead of av_clip_uint8_c()  
						
						... 
						
						
						
						The generic version should be faster if optimized. 
						
						
					 
					
						2013-12-20 19:13:42 +01:00 
						 
				 
			
				
					
						
							
							
								Stefano Sabatini 
							
						 
					 
					
						
						
							
						
						70e74e0072 
					 
					
						
						
							
							lavfi/hue: force table initialization for the first frame  
						
						
						
						
					 
					
						2013-12-20 19:13:42 +01: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 
							
						 
					 
					
						
						
							
						
						771e2e59e2 
					 
					
						
						
							
							lavfi/hue: relicense to LGPL with permission by all contributors  
						
						... 
						
						
						
						Signed-off-by: Paul B Mahol <onemda@gmail.com > 
						
						
					 
					
						2013-09-03 17:21:06 +00:00 
						 
				 
			
				
					
						
							
							
								Paul B Mahol 
							
						 
					 
					
						
						
							
						
						b1e276f8df 
					 
					
						
						
							
							lavfi/hue: allow changing brightness  
						
						... 
						
						
						
						Signed-off-by: Paul B Mahol <onemda@gmail.com > 
						
						
					 
					
						2013-08-22 14:56:13 +00:00 
						 
				 
			
				
					
						
							
							
								Paul B Mahol 
							
						 
					 
					
						
						
							
						
						e6876c7b7b 
					 
					
						
						
							
							lavfi/hue: use lookup tables  
						
						... 
						
						
						
						Signed-off-by: Paul B Mahol <onemda@gmail.com > 
						
						
					 
					
						2013-08-21 15:33:33 +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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								Stefano Sabatini 
							
						 
					 
					
						
						
							
						
						638ffb2413 
					 
					
						
						
							
							lavfi/hue: rework logic for setting commands  
						
						... 
						
						
						
						In particular, fix h/H commands in case h and H are not specified as
initial parameters. 
						
						
					 
					
						2013-04-23 22:33:53 +02:00 
						 
				 
			
				
					
						
							
							
								Clément Bœsch 
							
						 
					 
					
						
						
							
						
						fdd93eabfb 
					 
					
						
						
							
							lavfi: add timeline support.  
						
						... 
						
						
						
						Flag added in a few simple filters. A bunch of other filters can likely
use the feature as well. 
						
						
					 
					
						2013-04-23 01:02:27 +02:00 
						 
				 
			
				
					
						
							
							
								Clément Bœsch 
							
						 
					 
					
						
						
							
						
						b8a5c76131 
					 
					
						
						
							
							lavfi: add frame counter into AVFilterLink and use it in filters.  
						
						
						
						
					 
					
						2013-04-23 01:02:27 +02:00 
						 
				 
			
				
					
						
							
							
								Paul B Mahol 
							
						 
					 
					
						
						
							
						
						a47288f6dc 
					 
					
						
						
							
							lavfi/hue: add support for more alpha formats  
						
						... 
						
						
						
						Signed-off-by: Paul B Mahol <onemda@gmail.com > 
						
						
					 
					
						2013-04-12 19:46:19 +00:00 
						 
				 
			
				
					
						
							
							
								Paul B Mahol 
							
						 
					 
					
						
						
							
						
						047a027d0b 
					 
					
						
						
							
							lavfi/hue: copy alpha plane too  
						
						... 
						
						
						
						Signed-off-by: Paul B Mahol <onemda@gmail.com > 
						
						
					 
					
						2013-04-12 18:32:46 +00:00 
						 
				 
			
				
					
						
							
							
								Clément Bœsch 
							
						 
					 
					
						
						
							
						
						72ad0d56a1 
					 
					
						
						
							
							lavfi/hue: make do while (0) form meaningful.  
						
						
						
						
					 
					
						2013-04-12 20:10:58 +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 
						 
				 
			
				
					
						
							
							
								Stefano Sabatini 
							
						 
					 
					
						
						
							
						
						160ed967f4 
					 
					
						
						
							
							lavfi/hue: extend debugging message  
						
						... 
						
						
						
						In particular, show h value in degrees. 
						
						
					 
					
						2013-04-11 21:37:43 +02:00 
						 
				 
			
				
					
						
							
							
								Stefano Sabatini 
							
						 
					 
					
						
						
							
						
						3411aba82c 
					 
					
						
						
							
							lavfi/hue: reindent after last commit  
						
						
						
						
					 
					
						2013-04-11 21:37:35 +02:00 
						 
				 
			
				
					
						
							
							
								Stefano Sabatini 
							
						 
					 
					
						
						
							
						
						e4fd58f472 
					 
					
						
						
							
							lavfi/hue: apply major simplifications, and switch to AVOption-based system  
						
						... 
						
						
						
						This also drops support for "flat syntax" and "reinit" command.
"reinit" command is not very robust and complicates the logic more than
necessary, since requires to reset all the options in the command.
*This is a syntax break*. 
						
						
					 
					
						2013-04-11 21:37:19 +02:00 
						 
				 
			
				
					
						
							
							
								Clément Bœsch 
							
						 
					 
					
						
						
							
						
						f0a5f71074 
					 
					
						
						
							
							lavfi/hue: reindent.  
						
						
						
						
					 
					
						2013-03-10 02:13:02 +01:00 
						 
				 
			
				
					
						
							
							
								Clément Bœsch 
							
						 
					 
					
						
						
							
						
						3da54858d3 
					 
					
						
						
							
							lavfi/hue: add an optimized direct path.  
						
						
						
						
					 
					
						2013-03-10 02:13:02 +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 
						 
				 
			
				
					
						
							
							
								Stefano Sabatini 
							
						 
					 
					
						
						
							
						
						dd37326345 
					 
					
						
						
							
							lavfi/hue: reindent after previous commit  
						
						
						
						
					 
					
						2013-02-20 11:29:12 +01:00 
						 
				 
			
				
					
						
							
							
								Stefano Sabatini 
							
						 
					 
					
						
						
							
						
						d709a18ac2 
					 
					
						
						
							
							lavfi/hue: simplify parsing by making use of option shorthands  
						
						
						
						
					 
					
						2013-02-20 11:28:59 +01:00 
						 
				 
			
				
					
						
							
							
								Clément Bœsch 
							
						 
					 
					
						
						
							
						
						adfd9ca3fa 
					 
					
						
						
							
							lavfi/hue: move to ff_filter_frame.  
						
						
						
						
					 
					
						2012-12-02 14:44:31 +01:00 
						 
				 
			
				
					
						
							
							
								Clément Bœsch 
							
						 
					 
					
						
						
							
						
						2d9d444051 
					 
					
						
						
							
							lavfi: convert remaining input/output list compound literals to named objects.  
						
						... 
						
						
						
						This is following 568c70e79e 
						
						
					 
					
						2012-11-28 23:19:20 +01:00 
						 
				 
			
				
					
						
							
							
								Hendrik Leppkes 
							
						 
					 
					
						
						
							
						
						79393a8363 
					 
					
						
						
							
							Replace usage of the deprecated av_pix_fmt_descriptors array with av_pix_fmt_desc_get  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2012-10-20 18:00:13 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						ac627b3d38 
					 
					
						
						
							
							Merge commit '716d413c13981da15323c7a3821860536eefdbbb'  
						
						... 
						
						
						
						* commit '716d413c13981da15323c7a3821860536eefdbbb':
  Replace PIX_FMT_* -> AV_PIX_FMT_*, PixelFormat -> AVPixelFormat
Conflicts:
	doc/examples/muxing.c
	ffmpeg.h
	ffmpeg_filter.c
	ffmpeg_opt.c
	ffplay.c
	ffprobe.c
	libavcodec/8bps.c
	libavcodec/aasc.c
	libavcodec/aura.c
	libavcodec/avcodec.h
	libavcodec/avs.c
	libavcodec/bfi.c
	libavcodec/bmp.c
	libavcodec/bmpenc.c
	libavcodec/c93.c
	libavcodec/cscd.c
	libavcodec/cyuv.c
	libavcodec/dpx.c
	libavcodec/dpxenc.c
	libavcodec/eatgv.c
	libavcodec/escape124.c
	libavcodec/ffv1.c
	libavcodec/flashsv.c
	libavcodec/fraps.c
	libavcodec/h264.c
	libavcodec/huffyuv.c
	libavcodec/iff.c
	libavcodec/imgconvert.c
	libavcodec/indeo3.c
	libavcodec/kmvc.c
	libavcodec/libopenjpegdec.c
	libavcodec/libopenjpegenc.c
	libavcodec/libx264.c
	libavcodec/ljpegenc.c
	libavcodec/mjpegdec.c
	libavcodec/mjpegenc.c
	libavcodec/motionpixels.c
	libavcodec/mpeg12.c
	libavcodec/mpeg12enc.c
	libavcodec/mpeg4videodec.c
	libavcodec/mpegvideo_enc.c
	libavcodec/pamenc.c
	libavcodec/pcxenc.c
	libavcodec/pgssubdec.c
	libavcodec/pngdec.c
	libavcodec/pngenc.c
	libavcodec/pnm.c
	libavcodec/pnmdec.c
	libavcodec/pnmenc.c
	libavcodec/ptx.c
	libavcodec/qdrw.c
	libavcodec/qpeg.c
	libavcodec/qtrleenc.c
	libavcodec/raw.c
	libavcodec/rawdec.c
	libavcodec/rl2.c
	libavcodec/sgidec.c
	libavcodec/sgienc.c
	libavcodec/snowdec.c
	libavcodec/snowenc.c
	libavcodec/sunrast.c
	libavcodec/targa.c
	libavcodec/targaenc.c
	libavcodec/tiff.c
	libavcodec/tiffenc.c
	libavcodec/tmv.c
	libavcodec/truemotion2.c
	libavcodec/utils.c
	libavcodec/vb.c
	libavcodec/vp3.c
	libavcodec/wnv1.c
	libavcodec/xl.c
	libavcodec/xwddec.c
	libavcodec/xwdenc.c
	libavcodec/yop.c
	libavdevice/v4l2.c
	libavdevice/x11grab.c
	libavfilter/avfilter.c
	libavfilter/avfilter.h
	libavfilter/buffersrc.c
	libavfilter/drawutils.c
	libavfilter/formats.c
	libavfilter/src_movie.c
	libavfilter/vf_ass.c
	libavfilter/vf_drawtext.c
	libavfilter/vf_fade.c
	libavfilter/vf_format.c
	libavfilter/vf_hflip.c
	libavfilter/vf_lut.c
	libavfilter/vf_overlay.c
	libavfilter/vf_pad.c
	libavfilter/vf_scale.c
	libavfilter/vf_transpose.c
	libavfilter/vf_yadif.c
	libavfilter/video.c
	libavfilter/vsrc_testsrc.c
	libavformat/movenc.c
	libavformat/mxf.h
	libavformat/utils.c
	libavformat/yuv4mpeg.c
	libavutil/imgutils.c
	libavutil/pixdesc.c
	libswscale/input.c
	libswscale/output.c
	libswscale/swscale_internal.h
	libswscale/swscale_unscaled.c
	libswscale/utils.c
	libswscale/x86/swscale_template.c
	libswscale/x86/yuv2rgb.c
	libswscale/x86/yuv2rgb_template.c
	libswscale/yuv2rgb.c
Merged-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2012-10-08 21:06:57 +02:00 
						 
				 
			
				
					
						
							
							
								Stefano Sabatini 
							
						 
					 
					
						
						
							
						
						7fe1ecefe1 
					 
					
						
						
							
							lavfi/hue: simplify/fix setting logic in set_options()  
						
						... 
						
						
						
						Parse expression only when a new value is explicitly specified.
In particular, avoid double free in case an old expression value is
cached, it is set in the context, it is freed as the old value, and
finally the pointer stored in the context is freed again when the filter
is released. 
						
						
					 
					
						2012-09-23 00:46:33 +02:00 
						 
				 
			
				
					
						
							
							
								Stefano Sabatini 
							
						 
					 
					
						
						
							
						
						3aa1b53256 
					 
					
						
						
							
							lavfi/hue: set to NULL freed pointers  
						
						... 
						
						
						
						Possibly safer. 
						
						
					 
					
						2012-09-21 12:44:44 +02:00 
						 
				 
			
				
					
						
							
							
								Stefano Sabatini 
							
						 
					 
					
						
						
							
						
						31aa5b1a78 
					 
					
						
						
							
							lavfi/hue: fix crash when resetting the saturation expression  
						
						... 
						
						
						
						Previously when saturation was reinited, the old value was freed when
setting options, and freed again in PARSE_EXPRESSION(). 
						
						
					 
					
						2012-09-21 12:43:52 +02:00 
						 
				 
			
				
					
						
							
							
								Jérémy Tran 
							
						 
					 
					
						
						
							
						
						75d34864d1 
					 
					
						
						
							
							lavfi/hue: add dynamic expression evaluation support  
						
						... 
						
						
						
						Signed-off-by: Stefano Sabatini <stefasab@gmail.com > 
						
						
					 
					
						2012-09-15 01:05:27 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
							
						
						e60fcdb989 
					 
					
						
						
							
							vf_hue: fix AVOption defaults  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at > 
						
						
					 
					
						2012-09-05 22:18:53 +02:00 
						 
				 
			
				
					
						
							
							
								Jérémy Tran 
							
						 
					 
					
						
						
							
						
						54ca7e39da 
					 
					
						
						
							
							lavfi/hue: add process_command callback  
						
						... 
						
						
						
						This allows dynamic reconfiguration of the filter.
The callback uses some code that was in the init function. Hence this code
has been moved in its own function.
Signed-off-by: Stefano Sabatini <stefasab@gmail.com > 
						
						
					 
					
						2012-08-31 18:09:30 +02:00 
						 
				 
			
				
					
						
							
							
								Stefano Sabatini 
							
						 
					 
					
						
						
							
						
						42d621d131 
					 
					
						
						
							
							lavfi: add priv class to filter definitions and flags to filter internal options  
						
						... 
						
						
						
						This allows the iteration callbacks to discover the internal class and
options, and show them when required. 
						
						
					 
					
						2012-08-18 10:19:05 +02:00 
						 
				 
			
				
					
						
							
							
								Stefano Sabatini 
							
						 
					 
					
						
						
							
						
						208d6e6615 
					 
					
						
						
							
							lavfi/hue: add verbose debug message showing initial parameters  
						
						
						
						
					 
					
						2012-08-16 15:02:09 +02:00 
						 
				 
			
				
					
						
							
							
								Stefano Sabatini 
							
						 
					 
					
						
						
							
						
						5b0151a474 
					 
					
						
						
							
							lavfi/hue: reindent after previous commits  
						
						
						
						
					 
					
						2012-08-16 15:02:09 +02:00 
						 
				 
			
				
					
						
							
							
								Stefano Sabatini 
							
						 
					 
					
						
						
							
						
						419e1b7463 
					 
					
						
						
							
							lavfi/hue: apply misc fixes to default values setting  
						
						... 
						
						
						
						In particular: signal error in case of bogus h:s values. 
						
						
					 
					
						2012-08-16 15:02:09 +02:00 
						 
				 
			
				
					
						
							
							
								Jérémy Tran 
							
						 
					 
					
						
						
							
						
						191b77eb01 
					 
					
						
						
							
							lavfi/hue: add named options support  
						
						... 
						
						
						
						Old syntax has been kept for compatibility reasons.
Signed-off-by: Stefano Sabatini <stefasab@gmail.com > 
						
						
					 
					
						2012-08-16 15:01:05 +02:00 
						 
				 
			
				
					
						
							
							
								Jérémy Tran 
							
						 
					 
					
						
						
							
						
						ae60d2c877 
					 
					
						
						
							
							lavfi: add hue filter  
						
						... 
						
						
						
						This is a port of the MPlayer hue filter (libmpcodecs/vf_hue.c) by
Michael Niedermayer.
Signed-off-by: Jérémy Tran <tran.jeremy.av@gmail.com >
Signed-off-by: Stefano Sabatini <stefasab@gmail.com > 
						
						
					 
					
						2012-08-13 12:00:54 +02:00