Paul B Mahol 
							
						 
					 
					
						
						
						
						
							
						
						
							ed93ed5ee3 
							
						 
					 
					
						
						
							
							avfilter: don't anonymously typedef structs  
						
						... 
						
						
						
						Signed-off-by: Paul B Mahol <onemda@gmail.com> 
						
						
					 
					
						2017-05-13 11:39:28 +02:00 
						 
				 
			
				
					
						
							
							
								Muhammad Faiz 
							
						 
					 
					
						
						
						
						
							
						
						
							6af050d7d0 
							
						 
					 
					
						
						
							
							avfilter: do not use AVFrame accessor  
						
						... 
						
						
						
						Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com> 
						
						
					 
					
						2017-04-23 14:40:30 +07:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							bc6b53ae99 
							
						 
					 
					
						
						
							
							avfilter/asrc_flite: Fix textbuf leak  
						
						... 
						
						
						
						Fixes CID1244189
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> 
						
						
					 
					
						2017-01-06 16:26:05 +01: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 
							
						 
					 
					
						
						
						
						
							
						
						
							b6249d4f52 
							
						 
					 
					
						
						
							
							avfilter/flite: use AV_OPT_TYPE_BOOL for list_voices option  
						
						
						
						
					 
					
						2015-09-08 23:22:38 +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 
						 
				 
			
				
					
						
							
							
								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 
							
						 
					 
					
						
						
						
						
							
						
						
							976e3439ed 
							
						 
					 
					
						
						
							
							lavfi/flite: switch to AVOption-based system  
						
						
						
						
					 
					
						2013-04-11 21:37:48 +02: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
      759001c534287a96dc96d1e274665feb7059145d by Anton Khirnov.
      Also, fix the use of || instead of | in a flags check.
    - make buffer sink and src, audio and video work all together
Clément Bœsch:
  * Switch to AVFrame:
    - aevalsrc
    - alphaextract
    - blend
    - cellauto
    - colormatrix
    - concat
    - earwax
    - ebur128
    - edgedetect
    - geq
    - histeq
    - histogram
    - hue
    - kerndeint
    - life
    - movie
    - mp (with the help of Michael)
    - overlay
    - pad
    - pan
    - pp
    - pp
    - removelogo
    - sendcmd
    - showspectrum
    - showwaves
    - silencedetect
    - stereo3d
    - subtitles
    - super2xsai
    - swapuv
    - thumbnail
    - tile
Hendrik Leppkes:
  * Switch to AVFrame:
    - aconvert
    - amerge
    - asetnsamples
    - atempo
    - biquads
Matthieu Bouron:
  * Switch to AVFrame
    - alphamerge
    - decimate
    - volumedetect
Stefano Sabatini:
  * Switch to AVFrame:
    - astreamsync
    - flite
    - framestep
Signed-off-by: Michael Niedermayer <michaelni@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 
						 
				 
			
				
					
						
							
							
								Clément Bœsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2d9d444051 
							
						 
					 
					
						
						
							
							lavfi: convert remaining input/output list compound literals to named objects.  
						
						... 
						
						
						
						This is following 568c70e79ee267426c15ef4603c69703f6a5884a. 
						
						
					 
					
						2012-11-28 23:19:20 +01:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							cd7febd33f 
							
						 
					 
					
						
						
							
							lavfi: replace filter_samples by filter_frame  
						
						... 
						
						
						
						Based on patch by Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2012-11-28 16:43:34 +01:00 
						 
				 
			
				
					
						
							
							
								Paul B Mahol 
							
						 
					 
					
						
						
						
						
							
						
						
							1acd2f6ba7 
							
						 
					 
					
						
						
							
							Replace rest of libavutil/audioconvert.h with libavutil/channel_layout.h  
						
						... 
						
						
						
						Also remove it in once case when it is not needed.
Signed-off-by: Paul B Mahol <onemda@gmail.com> 
						
						
					 
					
						2012-11-13 13:21:21 +00:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							d46c1c72e4 
							
						 
					 
					
						
						
							
							Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'  
						
						... 
						
						
						
						* commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9':
  avopt: Store defaults for AV_OPT_TYPE_INT in the i64 union member
Conflicts:
	libavcodec/libopenjpegdec.c
	libavcodec/libopenjpegenc.c
	libavcodec/libx264.c
	libavcodec/mpeg12enc.c
	libavcodec/options_table.h
	libavcodec/snowenc.c
	libavcodec/tiffenc.c
	libavdevice/v4l2.c
	libavdevice/x11grab.c
	libavfilter/af_amix.c
	libavfilter/af_asyncts.c
	libavfilter/af_join.c
	libavfilter/buffersrc.c
	libavfilter/src_movie.c
	libavfilter/vf_delogo.c
	libavfilter/vf_drawtext.c
	libavformat/http.c
	libavformat/img2dec.c
	libavformat/img2enc.c
	libavformat/movenc.c
	libavformat/mpegenc.c
	libavformat/mpegtsenc.c
	libavformat/options_table.h
	libavformat/segment.c
Merged-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2012-09-05 14:33:32 +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 
						 
				 
			
				
					
						
							
							
								Clément Bœsch 
							
						 
					 
					
						
						
						
						
							
						
						
							cc650cf029 
							
						 
					 
					
						
						
							
							Remove "Error parsing options string [...]" messages.  
						
						... 
						
						
						
						This reduces from 3 to 2 messages for the same syntax error in ffprobe,
and from 4 to 3 in filters. 
						
						
					 
					
						2012-08-09 08:11:00 +02:00 
						 
				 
			
				
					
						
							
							
								Nicolas George 
							
						 
					 
					
						
						
						
						
							
						
						
							4ce87ecf2a 
							
						 
					 
					
						
						
							
							asrc_flite: do not crash on multiple instances.  
						
						... 
						
						
						
						The voice register functions return the same voice structure
upon multiple registration. It causes us two problems:
If we delete a voice without deregistering it, it leaves
a dangling pointer inside the library.
If we delete or unregister a voice at uninit, it may still
be in use by another instance of the filter.
The second problem is solved by keeping an usage counter inside
asrc_flite. This is not thread-safe, but neither is flite itself. 
						
						
					 
					
						2012-07-28 15:13:46 +02:00 
						 
				 
			
				
					
						
							
							
								Stefano Sabatini 
							
						 
					 
					
						
						
						
						
							
						
						
							66a5201819 
							
						 
					 
					
						
						
							
							lavfi: add flite audio source  
						
						
						
						
					 
					
						2012-07-28 11:06:43 +02:00