Michael Niedermayer 7ef8d97b1a Merge commit '7513234bdd93f80593bfee3eb2da8c8f0d3992da' ...

* commit '7513234bdd93f80593bfee3eb2da8c8f0d3992da':
  avfilter: more correct printf format specifiers

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2014-03-22 18:21:10 +01:00

..

libmpcodecs

…

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

…

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

…

af_aformat.c

…

af_amerge.c

lavfi/af_amerge: use av_make_q.

2014-01-19 17:12:40 +01:00

af_amix.c

…

af_anull.c

…

af_apad.c

avfilter: remove superflous lines

2014-02-26 16:37:59 +00:00

af_aphaser.c

…

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

…

af_asetrate.c

…

af_ashowinfo.c

Merge commit '7513234bdd93f80593bfee3eb2da8c8f0d3992da'

2014-03-22 18:21:10 +01:00

af_astats.c

…

af_astreamsync.c

…

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

…

af_channelmap.c

Merge commit 'e843612695007cc623813073754c651ab43021f7'

2014-03-16 14:18:01 +01:00

af_channelsplit.c

…

af_compand.c

af_compand: replace strtok_r() with av_get_token()

2014-02-28 21:55:46 +01:00

af_earwax.c

…

af_join.c

…

af_ladspa.c

…

af_pan.c

lavfi/pan: use extended_data instead of data.

2014-02-19 11:29:15 +01:00

af_replaygain.c

…

af_resample.c

Merge commit 'dcc7e4bf1d0913123bfafbc58bf47bd41dd5848d'

2014-02-24 21:46:00 +01:00

af_silencedetect.c

…

af_volume.c

Merge remote-tracking branch 'qatar/master'

2014-03-05 13:51:44 +01:00

af_volume.h

lavfi/volume: support volume expression and per-frame expression evaluation

2013-12-25 18:25:04 +01:00

af_volumedetect.c

…

all_channel_layouts.inc

…

allfilters.c

Merge commit '599b81ca9a8e04a27ddad94af462171d16063167'

2014-03-06 13:07:20 +01:00

asink_anullsink.c

…

asrc_abuffer.h

…

asrc_anullsrc.c

…

asrc_flite.c

…

asrc_sine.c

…

audio.c

…

audio.h

…

avcodec.c

…

avcodec.h

…

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

…

avf_showwaves.c

…

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

…

bufferqueue.h

…

buffersink.c

…

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

…

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

…

f_ebur128.c

lavfi/ebur128: add true peak metering per frame

2014-02-02 20:45:09 +01:00

f_interleave.c

…

f_perms.c

…

f_select.c

…

f_sendcmd.c

…

f_settb.c

…

f_zmq.c

…

fifo.c

…

filtfmts.c

…

formats.c

…

formats.h

…

framesync.c

…

framesync.h

…

gradfun.h

…

graphdump.c

…

graphparser.c

…

internal.h

Merge commit '5655732c77f2df9c1dfbddc30cd4844390a6921f'

2014-01-10 03:37:03 +01:00

lavfutils.c

…

lavfutils.h

…

libavfilter.v

…

lswsutils.c

…

lswsutils.h

…

Makefile

Merge commit '599b81ca9a8e04a27ddad94af462171d16063167'

2014-03-06 13:07:20 +01:00

opencl_allkernels.c

…

opencl_allkernels.h

…

pthread.c

…

setpts.c

…

split.c

…

src_movie.c

avfilter/src_movie: Check that the pixel format hasnt changed

2014-03-18 03:59:20 +01:00

thread.h

…

transform.c

…

transform.h

…

trim.c

Merge remote-tracking branch 'qatar/master'

2013-11-24 05:21:19 +01:00

unsharp_opencl_kernel.h

…

unsharp_opencl.c

…

unsharp_opencl.h

…

unsharp.h

…

version.h

Merge commit '599b81ca9a8e04a27ddad94af462171d16063167'

2014-03-06 13:07:20 +01:00

vf_alphamerge.c

…

vf_aspect.c

…

vf_bbox.c

…

vf_blackdetect.c

…

vf_blackframe.c

…

vf_blend.c

…

vf_boxblur.c

…

vf_colorbalance.c

…

vf_colorchannelmixer.c

…

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

…

vf_cropdetect.c

…

vf_curves.c

avfilter/curves: support slice threading.

2014-02-13 14:35:10 +01:00

vf_dctdnoiz.c

…

vf_decimate.c

…

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

…

vf_deshake.c

…

vf_drawbox.c

…

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

…

vf_elbg.c

avfilter/vf_elbg: Fixed seed range of elbg filter

2014-01-17 21:17:43 +01:00

vf_extractplanes.c

…

vf_fade.c

…

vf_field.c

…

vf_fieldmatch.c

…

vf_fieldorder.c

…

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

…

vf_frei0r.c

vf_frei0r: fix missing end of line character

2014-03-04 18:27:09 +01:00

vf_geq.c

…

vf_gradfun.c

avfilter: Add missing emms_c when needed

2014-03-05 11:00:05 +01:00

vf_hflip.c

…

vf_histeq.c

…

vf_histogram.c

…

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

…

vf_il.c

…

vf_interlace.c

Merge remote-tracking branch 'qatar/master'

2014-02-19 16:16:41 +01:00

vf_kerndeint.c

…

vf_libopencv.c

…

vf_lut3d.c

avfilter/lut3d: support slice threading.

2014-02-13 13:39:23 +01:00

vf_lut.c

…

vf_mcdeint.c

…

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

…

vf_mpdecimate.c

…

vf_noise.c

…

vf_null.c

…

vf_overlay.c

Merge commit 'de203abd71baae7f120313259b45cf935c85203e'

2014-02-04 14:33:33 +01:00

vf_owdenoise.c

…

vf_pad.c

avfilter/vf_pad: fix req_end

2013-12-03 04:09:10 +01:00

vf_perspective.c

…

vf_phase.c

…

vf_pixdesctest.c

…

vf_pp.c

…

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

…

vf_removelogo.c

…

vf_rotate.c

…

vf_sab.c

…

vf_scale.c

avfilter/vf_scale: simplify alignment code

2014-01-25 16:54:24 +01:00

vf_separatefields.c

…

vf_setfield.c

…

vf_showinfo.c

Merge commit '7513234bdd93f80593bfee3eb2da8c8f0d3992da'

2014-03-22 18:21:10 +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

…

vf_spp.c

…

vf_spp.h

…

vf_stereo3d.c

…

vf_subtitles.c

…

vf_super2xsai.c

…

vf_swapuv.c

…

vf_telecine.c

…

vf_thumbnail.c

…

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

…

vf_unsharp.c

…

vf_vflip.c

…

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

…

vf_w3fdif.c

…

vf_yadif.c

Change license of yadif from GPL to LGPL

2014-01-14 14:19:15 +01:00

video.c

…

video.h

…

vidstabutils.c

…

vidstabutils.h

…

vsink_nullsink.c

…

vsrc_cellauto.c

…

vsrc_life.c

…

vsrc_mandelbrot.c

…

vsrc_mptestsrc.c

…

vsrc_testsrc.c

…

yadif.h

Change license of yadif from GPL to LGPL

2014-01-14 14:19:15 +01:00