1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
FFmpeg/libavfilter
Michael Niedermayer 15fe694e5c Merge commit 'b4679ecdbd80ae050094733f137ccd7ebf1316ab'
* commit 'b4679ecdbd80ae050094733f137ccd7ebf1316ab':
  {v,a}f_showinfo: print frame side data

Conflicts:
	libavfilter/af_ashowinfo.c
	libavfilter/vf_showinfo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-24 15:32:48 +01:00
..
libmpcodecs Merge commit '5b9c3b4505206143d85398c1410949319fa1180f' 2013-11-16 23:54:10 +01:00
x86 Change license of yadif from GPL to LGPL 2014-01-14 14:19:15 +01:00
aeval.c avfilter/aeval: Fix use of uninitialized variable 2013-12-11 15:31:32 +01:00
af_aconvert.c lavfi: parsing helper for unknown channel layouts. 2013-11-03 10:30:25 +01:00
af_adelay.c avfilter: remove superflous lines 2014-02-26 16:37:59 +00:00
af_aecho.c avfilter: remove superflous lines 2014-02-26 16:37:59 +00:00
af_afade.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
af_aformat.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
af_amerge.c lavfi/af_amerge: use av_make_q. 2014-01-19 17:12:40 +01:00
af_amix.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
af_anull.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
af_apad.c avfilter: remove superflous lines 2014-02-26 16:37:59 +00:00
af_aphaser.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
af_aresample.c af_aresample: remove only use of array compound literals with non-const initializers in FFmpeg. 2013-12-30 12:38:04 +01:00
af_asetnsamples.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
af_asetrate.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
af_ashowinfo.c Merge commit 'b4679ecdbd80ae050094733f137ccd7ebf1316ab' 2014-03-24 15:32:48 +01:00
af_astats.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
af_astreamsync.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
af_asyncts.c Merge remote-tracking branch 'qatar/master' 2013-11-24 05:21:19 +01:00
af_atempo.c lavfi/af_atempo: clear references before returning error. 2014-03-08 12:31:00 +01:00
af_biquads.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
af_channelmap.c Merge commit 'e843612695007cc623813073754c651ab43021f7' 2014-03-16 14:18:01 +01:00
af_channelsplit.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
af_compand.c af_compand: replace strtok_r() with av_get_token() 2014-02-28 21:55:46 +01:00
af_earwax.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
af_join.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
af_ladspa.c lavfi/ladspa: cast return value of av_x_if_null to char*, fix warnings 2013-11-05 00:04:17 +01:00
af_pan.c lavfi/pan: use extended_data instead of data. 2014-02-19 11:29:15 +01:00
af_replaygain.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
af_resample.c Merge commit 'dcc7e4bf1d0913123bfafbc58bf47bd41dd5848d' 2014-02-24 21:46:00 +01:00
af_silencedetect.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
af_volume.c Merge commit '06c3cd3c0186803619bc6aad2d8f06c3e9015d15' 2014-03-24 15:04:47 +01:00
af_volume.h Merge commit '06c3cd3c0186803619bc6aad2d8f06c3e9015d15' 2014-03-24 15:04:47 +01:00
af_volumedetect.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
all_channel_layouts.inc
allfilters.c Merge commit '599b81ca9a8e04a27ddad94af462171d16063167' 2014-03-06 13:07:20 +01:00
asink_anullsink.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
asrc_abuffer.h
asrc_anullsrc.c lavfi: parsing helper for unknown channel layouts. 2013-11-03 10:30:25 +01:00
asrc_flite.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
asrc_sine.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
audio.c
audio.h
avcodec.c
avcodec.h Do not leave positive values undefined when negative are defined as error 2013-10-19 16:42:57 +02:00
avf_avectorscope.c avfilter/avectorscope: fix {} mistake in alloc check. 2013-12-26 13:49:15 +01:00
avf_concat.c lavfi/avf_concat: use av_make_q. 2014-01-19 17:12:50 +01:00
avf_showspectrum.c avfilter/showspectrum: use 0 dummies for range in const. 2013-11-20 16:38:09 +01:00
avf_showwaves.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
avfilter.c Merge commit 'bba2a7cc5f7c7aaa32a938f3d4edd9f555f39cdb' 2014-03-06 12:38:09 +01:00
avfilter.h avfilter: make avfilter_graph_get_filter use const string name 2014-03-14 23:18:59 +01:00
avfiltergraph.c avfilter: make avfilter_graph_get_filter use const string name 2014-03-14 23:18:59 +01:00
avfiltergraph.h
avfilterres.rc Add Windows resource file support for shared libraries 2013-12-05 23:42:07 +01:00
bbox.c
bbox.h
buffer.c Merge remote-tracking branch 'qatar/master' 2013-11-05 12:17:35 +01:00
bufferqueue.h
buffersink.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
buffersink.h Merge remote-tracking branch 'qatar/master' 2014-02-15 04:05:04 +01:00
buffersrc.c Merge commit '104a97beaffa6348e6fd2c2d07d67c1402322bb3' 2014-01-17 16:38:10 +01:00
buffersrc.h Merge remote-tracking branch 'qatar/master' 2014-02-15 04:05:04 +01:00
deshake_opencl_kernel.h lavfi/deshake_opencl: optimze transform filter 2013-12-19 13:31:31 +01:00
deshake_opencl.c lavfi/deshake_opencl: optimze transform filter 2013-12-19 13:31:31 +01:00
deshake_opencl.h lavfi/deshake_opencl: optimze transform filter 2013-12-19 13:31:31 +01:00
deshake.h lavfi/deshake_opencl: optimze transform filter 2013-12-19 13:31:31 +01:00
drawutils.c lavfi/drawutils: set subsampling for rgb too 2013-07-14 17:59:25 +00:00
drawutils.h
dualinput.c avfilter/dualinput: fix repeatlast to match docs and eof_action=pass 2014-02-04 14:54:14 +01:00
dualinput.h avfilter/dualinput: simplify 2013-09-30 08:47:40 +00:00
f_ebur128.c lavfi/ebur128: add true peak metering per frame 2014-02-02 20:45:09 +01:00
f_interleave.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
f_perms.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
f_select.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
f_sendcmd.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
f_settb.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
f_zmq.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
fifo.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
filtfmts.c filtfmts-test: Fix use of deprecated API 2013-11-04 16:20:44 +01:00
formats.c lavfi: parsing helper for unknown channel layouts. 2013-11-03 10:30:25 +01:00
formats.h
framesync.c lavfi: add an API to synchronize multiple video inputs. 2013-09-23 09:49:37 +02:00
framesync.h lavfi: add an API to synchronize multiple video inputs. 2013-09-23 09:49:37 +02:00
gradfun.h Merge commit 'f6633c55a3c0e93a5b2bab6aa0692fb608f2a38d' 2013-10-23 12:14:49 +02:00
graphdump.c avfilter/graphdump: fix use of deprecated symbols 2013-08-25 19:33:44 +02:00
graphparser.c avfilter/graphparser: zero filter_ctx in case of deallocation in create_filter() 2013-11-07 23:38:44 +01:00
internal.h Merge commit '5655732c77f2df9c1dfbddc30cd4844390a6921f' 2014-01-10 03:37:03 +01:00
lavfutils.c Merge commit '5b9c3b4505206143d85398c1410949319fa1180f' 2013-11-16 23:54:10 +01:00
lavfutils.h Do not leave positive values undefined when negative are defined as error 2013-10-19 16:42:57 +02:00
libavfilter.v
lswsutils.c avfilter/lswsutils: dont override the default scaler 2013-10-07 13:28:13 +02:00
lswsutils.h
Makefile Merge commit '599b81ca9a8e04a27ddad94af462171d16063167' 2014-03-06 13:07:20 +01:00
opencl_allkernels.c
opencl_allkernels.h
pthread.c lavfi/pthread: Avoid crashes/odd behavior caused by spurious wakeups 2013-10-22 17:05:26 +01:00
setpts.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
split.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
src_movie.c avfilter/src_movie: Check that the pixel format hasnt changed 2014-03-18 03:59:20 +01:00
thread.h Merge remote-tracking branch 'qatar/master' 2013-09-28 11:02:01 +02:00
transform.c avfilter: various cosmetics 2013-09-12 14:01:43 +00:00
transform.h
trim.c Merge remote-tracking branch 'qatar/master' 2013-11-24 05:21:19 +01:00
unsharp_opencl_kernel.h avfilter/unsharp: added optimized opencl kernels 2013-11-07 22:31:43 +01:00
unsharp_opencl.c avfilter/unsharp: added optimized opencl kernels 2013-11-07 22:31:43 +01:00
unsharp_opencl.h
unsharp.h avfilter/unsharp: added optimized opencl kernels 2013-11-07 22:31:43 +01:00
version.h Merge commit '599b81ca9a8e04a27ddad94af462171d16063167' 2014-03-06 13:07:20 +01:00
vf_alphamerge.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_aspect.c avfilter/vf_aspect: remove dupe constants setup 2013-11-03 16:39:22 +00:00
vf_bbox.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_blackdetect.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_blackframe.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_blend.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_boxblur.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_colorbalance.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_colorchannelmixer.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_colormatrix.c Fix FSF address in colormatrix and libzvbi license headers. 2014-02-22 11:17:56 +01:00
vf_copy.c Merge remote-tracking branch 'qatar/master' 2014-02-24 10:47:47 +01:00
vf_crop.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_cropdetect.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_curves.c avfilter/curves: support slice threading. 2014-02-13 14:35:10 +01:00
vf_dctdnoiz.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_decimate.c libavfilter/decimate: Add pts of first frame to all frames. 2013-10-31 11:24:43 +01:00
vf_dejudder.c lavfi: adding dejudder filter to remove judder produced by partially telecined material. 2014-02-16 17:43:58 +01:00
vf_delogo.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_deshake.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_drawbox.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_drawtext.c Fix compilation with msvc/icl due to missing header and define. 2014-02-03 19:48:41 +01:00
vf_edgedetect.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_elbg.c avfilter/vf_elbg: Fixed seed range of elbg filter 2014-01-17 21:17:43 +01:00
vf_extractplanes.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_fade.c avfilter/fade: use FADE_OUT macro. 2013-11-10 19:16:45 +01:00
vf_field.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_fieldmatch.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_fieldorder.c vf_fieldorder: remove superfluous get_video_buffer 2013-11-04 14:37:06 +01:00
vf_format.c avfilter/vf_format: check that the format list is not empty 2014-01-05 20:14:03 +01:00
vf_fps.c avfilter/vf_fps: fix rounding error accumulation 2014-02-20 02:36:02 +01:00
vf_framepack.c Merge commit 'a7d0e7ead95e584c4866617f046b2493066975c6' 2014-01-10 03:00:48 +01:00
vf_framestep.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_frei0r.c vf_frei0r: fix missing end of line character 2014-03-04 18:27:09 +01:00
vf_geq.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_gradfun.c avfilter: Add missing emms_c when needed 2014-03-05 11:00:05 +01:00
vf_hflip.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_histeq.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_histogram.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_hqdn3d.c Merge remote-tracking branch 'qatar/master' 2014-03-05 13:51:44 +01:00
vf_hqdn3d.h
vf_hue.c lavfi/hue: show first decimal value of saturation 2013-12-20 19:25:42 +01:00
vf_idet.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_il.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_interlace.c Merge remote-tracking branch 'qatar/master' 2014-02-19 16:16:41 +01:00
vf_kerndeint.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_libopencv.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_lut3d.c avfilter/lut3d: support slice threading. 2014-02-13 13:39:23 +01:00
vf_lut.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_mcdeint.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_mergeplanes.c lavu,lavfi,lavd: do not hardcode AV_PIX_FMT_NB value when setting pixel format max value 2013-12-26 11:35:27 +01:00
vf_mp.c avfilter/vf_mp: fix missing FF_API_XVMC check 2013-11-18 01:22:30 +01:00
vf_mpdecimate.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_noise.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_null.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_overlay.c Merge commit 'de203abd71baae7f120313259b45cf935c85203e' 2014-02-04 14:33:33 +01:00
vf_owdenoise.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_pad.c avfilter/vf_pad: fix req_end 2013-12-03 04:09:10 +01:00
vf_perspective.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_phase.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_pixdesctest.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_pp.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_psnr.c Fix a few heigth/height typo. 2014-02-07 09:33:56 +01:00
vf_pullup.c avfilter/vf_pullup: fix memleak on error 2013-12-13 15:14:03 +01:00
vf_pullup.h avfilter/vf_pullup: remove junk_down nonsense 2013-09-18 12:47:57 +00:00
vf_removelogo.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_rotate.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_sab.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_scale.c avfilter/vf_scale: simplify alignment code 2014-01-25 16:54:24 +01:00
vf_separatefields.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_setfield.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_showinfo.c Merge commit 'b4679ecdbd80ae050094733f137ccd7ebf1316ab' 2014-03-24 15:32:48 +01:00
vf_shuffleplanes.c avfilter/vf_shuffleplanes: Fix flags / add AV_OPT_FLAG_FILTERING_PARAM 2014-03-06 16:58:24 +01:00
vf_smartblur.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_spp.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_spp.h
vf_stereo3d.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_subtitles.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_super2xsai.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_swapuv.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_telecine.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_thumbnail.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_tile.c lavfi/vf_tile: use av_make_q. 2014-01-19 17:13:02 +01:00
vf_tinterlace.c avfilter/vf_tinterlace: Fix vf_tinterlace mode 6 (interlacex2) 2014-03-16 17:25:54 +01:00
vf_transpose.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_unsharp.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_vflip.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_vidstabdetect.c lavfi/vidstabtransform: apply various cosmetical nits 2014-01-16 12:35:17 +01:00
vf_vidstabtransform.c lavfi/vidstabtransform: apply various documentation/option minor fixes 2014-01-19 12:20:10 +01:00
vf_vignette.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_w3fdif.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vf_yadif.c Change license of yadif from GPL to LGPL 2014-01-14 14:19:15 +01:00
video.c avfilter/video: remove commented out cruft 2013-09-13 19:17:56 +00:00
video.h
vidstabutils.c
vidstabutils.h
vsink_nullsink.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vsrc_cellauto.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vsrc_life.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vsrc_mandelbrot.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vsrc_mptestsrc.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
vsrc_testsrc.c Merge remote-tracking branch 'qatar/master' 2013-10-29 11:58:11 +01:00
yadif.h Change license of yadif from GPL to LGPL 2014-01-14 14:19:15 +01:00