Stefano Sabatini 
							
						 
					 
					
						
						
						
						
							
						
						
							3933963d7b 
							
						 
					 
					
						
						
							
							lavfi/testsrc: fix style  
						
						
						
						
					 
					
						2013-04-17 22:39:44 +02:00 
						 
				 
			
				
					
						
							
							
								Stefano Sabatini 
							
						 
					 
					
						
						
						
						
							
						
						
							7ab6312610 
							
						 
					 
					
						
						
							
							lavfi/testsrc: use int in place of unsigned  
						
						... 
						
						
						
						Avoid implicit int->unsigned conversion, causing invalid access in case
of negative linesize.
Fix crash with:
ffplay -f lavfi testsrc,vflip 
						
						
					 
					
						2013-04-17 22:39:34 +02:00 
						 
				 
			
				
					
						
							
							
								Paul B Mahol 
							
						 
					 
					
						
						
						
						
							
						
						
							6ffe911302 
							
						 
					 
					
						
						
							
							lavfi/testsrc: unbreak smptebars only build  
						
						... 
						
						
						
						Signed-off-by: Paul B Mahol <onemda@gmail.com> 
						
						
					 
					
						2013-04-14 21:13:39 +00:00 
						 
				 
			
				
					
						
							
							
								Clément Bœsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f359be96ca 
							
						 
					 
					
						
						
							
							lavfi/smptehdbars: fix priv_class pointer.  
						
						... 
						
						
						
						Fix Ticket2468. 
						
						
					 
					
						2013-04-14 10:32:35 +02:00 
						 
				 
			
				
					
						
							
							
								Clément Bœsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d9be6e69cf 
							
						 
					 
					
						
						
							
							lavfi/testsrc: grammar fix in comment after 03e2ec32.  
						
						
						
						
					 
					
						2013-04-14 03:27:48 +02:00 
						 
				 
			
				
					
						
							
							
								Paul B Mahol 
							
						 
					 
					
						
						
						
						
							
						
						
							03e2ec32b8 
							
						 
					 
					
						
						
							
							lavfi: add smptehdbars source  
						
						... 
						
						
						
						Signed-off-by: Paul B Mahol <onemda@gmail.com> 
						
						
					 
					
						2013-04-14 00:25:09 +00:00 
						 
				 
			
				
					
						
							
							
								Stefano Sabatini 
							
						 
					 
					
						
						
						
						
							
						
						
							87dd62e141 
							
						 
					 
					
						
						
							
							lavfi/testsrc: make use of AV_OPT_TYPE_DURATION  
						
						... 
						
						
						
						Simplify. 
						
						
					 
					
						2013-04-13 14:09:16 +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 
						 
				 
			
				
					
						
							
							
								Anton Khirnov 
							
						 
					 
					
						
						
						
						
							
						
						
							d69a4177b9 
							
						 
					 
					
						
						
							
							lavfi: remove now unused args parameter from AVFilter.init  
						
						... 
						
						
						
						Conflicts:
	libavfilter/avfilter.c
	libavfilter/vf_drawtext.c
	libavfilter/vf_lut.c
	libavfilter/vf_select.c
	libavfilter/vf_setpts.c
	libavfilter/vsrc_color.c
	libavfilter/vsrc_movie.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2013-04-12 11:54:39 +02:00 
						 
				 
			
				
					
						
							
							
								Clément Bœsch 
							
						 
					 
					
						
						
						
						
							
						
						
							389eb0a919 
							
						 
					 
					
						
						
							
							lavfi/testsrc: remove useless args/NULL passing.  
						
						
						
						
					 
					
						2013-04-11 14:36:50 +02:00 
						 
				 
			
				
					
						
							
							
								Paul B Mahol 
							
						 
					 
					
						
						
						
						
							
						
						
							38d1a5a270 
							
						 
					 
					
						
						
							
							lavfi/smptebars: switch to AVOptions-based system  
						
						... 
						
						
						
						Signed-off-by: Paul B Mahol <onemda@gmail.com> 
						
						
					 
					
						2013-04-11 12:22:42 +00:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							ef29a95a4d 
							
						 
					 
					
						
						
							
							Merge commit '7b3eb745b98b04dd8a4970b9fd6c98998e858fc1'  
						
						... 
						
						
						
						* commit '7b3eb745b98b04dd8a4970b9fd6c98998e858fc1':
  vsrc_testsrc: switch to an AVOptions-based system.
Conflicts:
	doc/filters.texi
	libavfilter/vsrc_testsrc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2013-04-11 10:02:07 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							670e0f7f66 
							
						 
					 
					
						
						
							
							Merge commit 'b7b3302f8f2c7d9f6e08e0a976890eefe3edcc9e'  
						
						... 
						
						
						
						* commit 'b7b3302f8f2c7d9f6e08e0a976890eefe3edcc9e':
  vsrc_nullsrc: switch to an AVOptions-based system.
Conflicts:
	libavfilter/vsrc_nullsrc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2013-04-11 03:20:43 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							8bafd83aaa 
							
						 
					 
					
						
						
							
							Merge commit '7bc1a883c9158bb6e383d86fc76bdf2541e9a9fe'  
						
						... 
						
						
						
						* commit '7bc1a883c9158bb6e383d86fc76bdf2541e9a9fe':
  vsrc_color: switch to an AVOptions-based system.
Conflicts:
	doc/filters.texi
	libavfilter/vsrc_color.c
Merged-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2013-04-11 03:10:43 +02:00 
						 
				 
			
				
					
						
							
							
								Anton Khirnov 
							
						 
					 
					
						
						
						
						
							
						
						
							7b3eb745b9 
							
						 
					 
					
						
						
							
							vsrc_testsrc: switch to an AVOptions-based system.  
						
						
						
						
					 
					
						2013-04-09 19:12:06 +02:00 
						 
				 
			
				
					
						
							
							
								Paul B Mahol 
							
						 
					 
					
						
						
						
						
							
						
						
							bd252ff6fa 
							
						 
					 
					
						
						
							
							lavfi/smptebars: fix invalid writes  
						
						... 
						
						
						
						Signed-off-by: Paul B Mahol <onemda@gmail.com> 
						
						
					 
					
						2013-04-04 22:10:42 +00:00 
						 
				 
			
				
					
						
							
							
								Paul B Mahol 
							
						 
					 
					
						
						
						
						
							
						
						
							6a08ccd61d 
							
						 
					 
					
						
						
							
							lavfi/smptebars: fix output for subsampled yuv  
						
						... 
						
						
						
						Signed-off-by: Paul B Mahol <onemda@gmail.com> 
						
						
					 
					
						2013-04-04 14:32:49 +00:00 
						 
				 
			
				
					
						
							
							
								Paul B Mahol 
							
						 
					 
					
						
						
						
						
							
						
						
							54056c6655 
							
						 
					 
					
						
						
							
							lavfi/testsrc: make use of AV_OPT_TYPE_VIDEO_RATE  
						
						... 
						
						
						
						Signed-off-by: Paul B Mahol <onemda@gmail.com> 
						
						
					 
					
						2013-03-26 13:23:41 +00:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							ae65327e5e 
							
						 
					 
					
						
						
							
							vsrc_testsrc: avoid floats and non bit exactness  
						
						... 
						
						
						
						The round to zero behavior is maintained, possibly this should
be changed to round to nearest.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2013-03-25 03:11:43 +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
      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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							6f88d2d786 
							
						 
					 
					
						
						
							
							vsrc_testsrc: Fix assignments in if()  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2013-01-14 05:05:40 +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 
						 
				 
			
				
					
						
							
							
								Anton Khirnov 
							
						 
					 
					
						
						
						
						
							
						
						
							f7f6f281dd 
							
						 
					 
					
						
						
							
							vsrc_testsrc: switch to filter_frame  
						
						... 
						
						
						
						Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2012-11-28 21:58:39 +01: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 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							526cb36e4b 
							
						 
					 
					
						
						
							
							Merge commit '4436f25a1682ada3f7226cb6fadf429946933161'  
						
						... 
						
						
						
						* commit '4436f25a1682ada3f7226cb6fadf429946933161':
  build: remove references to unused EXTRAOBJS variable
  lavfi: convert input/ouput list compound literals to named objects
  fate: add h263 obmc vsynth tests
  avconv: remove bogus warning when using avconv -h without parameter
  averror: explicitly define AVERROR_* values
  flashsv: propagate inflateReset() errors
  indeo4/5: remove constant parameter num_bands from wavelet recomposition
  mxfdec: return error if no segments are available in mxf_get_sorted_table_segments
  Double motion vector range for HPEL interlaced picture in proper place
Conflicts:
	libavcodec/v210dec.h
	libavfilter/af_aformat.c
	libavfilter/af_amix.c
	libavfilter/af_asyncts.c
	libavfilter/af_channelmap.c
	libavfilter/af_join.c
	libavfilter/asrc_anullsrc.c
	libavfilter/buffersrc.c
	libavfilter/f_setpts.c
	libavfilter/f_settb.c
	libavfilter/fifo.c
	libavfilter/src_movie.c
	libavfilter/vf_ass.c
	libavfilter/vf_blackframe.c
	libavfilter/vf_boxblur.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_hflip.c
	libavfilter/vf_overlay.c
	libavfilter/vf_pad.c
	libavfilter/vf_select.c
	libavfilter/vf_transpose.c
	libavfilter/vf_yadif.c
	libavfilter/vsrc_testsrc.c
	libavformat/mxfdec.c
	libavutil/error.h
Merged-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2012-10-11 15:46:48 +02: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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								Anton Khirnov 
							
						 
					 
					
						
						
						
						
							
						
						
							716d413c13 
							
						 
					 
					
						
						
							
							Replace PIX_FMT_* -> AV_PIX_FMT_*, PixelFormat -> AVPixelFormat  
						
						
						
						
					 
					
						2012-10-08 07:13:26 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							3dc24600ba 
							
						 
					 
					
						
						
							
							vsrc_testsrc: Fix case without a specified duration  
						
						... 
						
						
						
						Fixes regression since 98f753ec5198d4f74ba9f68cc85badf8a6257547
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2012-09-21 03:00:15 +02:00 
						 
				 
			
				
					
						
							
							
								Stefano Sabatini 
							
						 
					 
					
						
						
						
						
							
						
						
							98f753ec51 
							
						 
					 
					
						
						
							
							lavfi/testsrc: increase precision of the duration parameter  
						
						... 
						
						
						
						Compute duration in microseconds, rather than in timebase units. Decrease
approximation errors. 
						
						
					 
					
						2012-09-20 12:13:17 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							91af76099e 
							
						 
					 
					
						
						
							
							Merge commit '23aae62c2cb4504a09ceb8cd0cabc1c8b260f521'  
						
						... 
						
						
						
						* commit '23aae62c2cb4504a09ceb8cd0cabc1c8b260f521':
  alsdec: Check k used for rice decoder.
  avfiltergraph: silence an uninitialized variable warning
  xsubenc: reindent
  lavc: replace AVCodecContext.encode with subtitle-specific callback
  lavc: add const to private codec class initialization.
  avconv: don't pass a bogus parameter to avfilter_graph_create_filter().
  id3v2: strdup the genre name explicitly.
  lavf/id3v2: do not export empty fields.
  buffersrc: add const to the AVFrame* argument of av_buffersrc_write_frame()
  lavfi: replace empty input/output lists with null pointers
Conflicts:
	ffmpeg_filter.c
	libavcodec/alsdec.c
	libavcodec/dvdsubenc.c
	libavcodec/utils.c
	libavcodec/v210dec.h
	libavfilter/af_channelsplit.c
	libavfilter/avfiltergraph.c
	libavfilter/buffersrc.c
	libavfilter/src_movie.c
	libavfilter/vf_ass.c
Merged-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2012-09-18 14:45:44 +02:00 
						 
				 
			
				
					
						
							
							
								Mans Rullgard 
							
						 
					 
					
						
						
						
						
							
						
						
							1fce361d70 
							
						 
					 
					
						
						
							
							lavfi: replace empty input/output lists with null pointers  
						
						... 
						
						
						
						Signed-off-by: Mans Rullgard <mans@mansr.com> 
						
						
					 
					
						2012-09-17 14:35:06 +01: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 
						 
				 
			
				
					
						
							
							
								Martin Storsjö 
							
						 
					 
					
						
						
						
						
							
						
						
							21bc440384 
							
						 
					 
					
						
						
							
							avopt: Explicitly store rational option defaults in .dbl  
						
						... 
						
						
						
						Signed-off-by: Martin Storsjö <martin@martin.st> 
						
						
					 
					
						2012-09-04 23:13:55 +03:00 
						 
				 
			
				
					
						
							
							
								Martin Storsjö 
							
						 
					 
					
						
						
						
						
							
						
						
							235f74db59 
							
						 
					 
					
						
						
							
							Rename missed cases of FF_OPT_TYPE_* to AV_OPT_TYPE_*  
						
						... 
						
						
						
						Signed-off-by: Martin Storsjö <martin@martin.st> 
						
						
					 
					
						2012-08-31 23:27:21 +02:00 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							310fd0d3d4 
							
						 
					 
					
						
						
							
							vsrc_testsrc: fix uninitilaized variable bug  
						
						... 
						
						
						
						Found-by: gcc
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2012-08-30 05:15:03 +02:00 
						 
				 
			
				
					
						
							
							
								Stefano Sabatini 
							
						 
					 
					
						
						
						
						
							
						
						
							7cd5fa35fe 
							
						 
					 
					
						
						
							
							lavfi/testsrc: set output framerate  
						
						
						
						
					 
					
						2012-08-18 12:02:43 +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 
						 
				 
			
				
					
						
							
							
								Michael Niedermayer 
							
						 
					 
					
						
						
						
						
							
						
						
							c581cb4e4f 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'qatar/master'  
						
						... 
						
						
						
						* qatar/master:
  Fix even more missing includes after the common.h removal
  build: Factor out rangecoder dependencies to CONFIG_RANGECODER
  build: Factor out error resilience dependencies to CONFIG_ERROR_RESILIENCE
  x86: avcodec: Consistently name all init files
  Add more missing includes after removing the implicit common.h
  Add some more missing includes after removing the implicit common.h
  Don't include common.h from avutil.h
  rtmp: Automatically compute the hash for SWFVerification
Conflicts:
	configure
	doc/APIchanges
	doc/examples/decoding_encoding.c
	libavcodec/Makefile
	libavcodec/assdec.c
	libavcodec/audio_frame_queue.c
	libavcodec/avpacket.c
	libavcodec/dv_profile.c
	libavcodec/dwt.c
	libavcodec/libtheoraenc.c
	libavcodec/rawdec.c
	libavcodec/rv40dsp.c
	libavcodec/tiff.c
	libavcodec/tiffenc.c
	libavcodec/v210dec.h
	libavcodec/vc1dsp.c
	libavcodec/x86/Makefile
	libavfilter/asrc_anullsrc.c
	libavfilter/avfilter.c
	libavfilter/buffer.c
	libavfilter/formats.c
	libavfilter/vf_ass.c
	libavfilter/vf_drawtext.c
	libavfilter/vf_fade.c
	libavfilter/vf_select.c
	libavfilter/video.c
	libavfilter/vsrc_testsrc.c
	libavformat/version.h
	libavutil/audioconvert.c
	libavutil/error.h
	libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at> 
						
						
					 
					
						2012-08-16 16:20:30 +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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								Stefano Sabatini 
							
						 
					 
					
						
						
						
						
							
						
						
							dbf25b70ea 
							
						 
					 
					
						
						
							
							lavfi/testsrc: set default value for option "color" to NULL and rework color setting logic  
						
						... 
						
						
						
						Fix bogus warnings of the kind:
option 'color' is ignored with source 'testsrc'
when the color value is not explicitely set and the filter is different
from "color". 
						
						
					 
					
						2012-08-08 16:49:53 +02:00 
						 
				 
			
				
					
						
							
							
								Paul B Mahol 
							
						 
					 
					
						
						
						
						
							
						
						
							13c5069187 
							
						 
					 
					
						
						
							
							lavfi: add smptebars source  
						
						... 
						
						
						
						Patch readapted by Stefano Sabatini, color values proposed by Tim
Nicholson <nichot20@yahoo.com>.
Address trac ticket #1462 .
See thread:
Subject: [FFmpeg-devel] [PATCH] smptebars filter
Date: Wed, 20 Jun 2012 01:54:58 +0000
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com> 
						
						
					 
					
						2012-08-07 20:06:56 +02:00 
						 
				 
			
				
					
						
							
							
								Stefano Sabatini 
							
						 
					 
					
						
						
						
						
							
						
						
							39a8275fdf 
							
						 
					 
					
						
						
							
							lavfi: move color filter to testsrc, factorize  
						
						
						
						
					 
					
						2012-08-03 16:26:58 +02:00 
						 
				 
			
				
					
						
							
							
								Stefano Sabatini 
							
						 
					 
					
						
						
						
						
							
						
						
							aa5b93fbd8 
							
						 
					 
					
						
						
							
							lavfi/rgbtestsrc: use ff_fill_rgba_map() rather than a local copy  
						
						... 
						
						
						
						Also convert int rgba_map[4] to uint8_t rgba_map[4], as required by
ff_fill_rgba_map().
Simplify. 
						
						
					 
					
						2012-08-02 12:32:48 +02:00 
						 
				 
			
				
					
						
							
							
								Stefano Sabatini 
							
						 
					 
					
						
						
						
						
							
						
						
							4c8fc6a2a4 
							
						 
					 
					
						
						
							
							lavfi/testsrc: use AVFILTER_DEFINE_CLASS for defining the filter classes  
						
						... 
						
						
						
						Factorize. 
						
						
					 
					
						2012-08-01 22:47:23 +02:00 
						 
				 
			
				
					
						
							
							
								Stefano Sabatini 
							
						 
					 
					
						
						
						
						
							
						
						
							33474eb1c6 
							
						 
					 
					
						
						
							
							lavfi/testsrc: extend logic in request_frame, support static image output  
						
						
						
						
					 
					
						2012-08-01 22:47:04 +02:00 
						 
				 
			
				
					
						
							
							
								Stefano Sabatini 
							
						 
					 
					
						
						
						
						
							
						
						
							20e940e768 
							
						 
					 
					
						
						
							
							lavfi/testsrc: free the context in uninit  
						
						... 
						
						
						
						Keeping stuff in the context can be useful for debugging purposes. 
						
						
					 
					
						2012-08-01 22:46:08 +02:00 
						 
				 
			
				
					
						
							
							
								Stefano Sabatini 
							
						 
					 
					
						
						
						
						
							
						
						
							7ddf082f04 
							
						 
					 
					
						
						
							
							lavfi/testsrc: drop pointless parentheses  
						
						
						
						
					 
					
						2012-08-01 11:05:47 +02:00