Michael Niedermayer 0e1c827e84 Merge remote-tracking branch 'origin/master' ...

* origin/master:
  libavfilter/vf_blend: do not unconditionally compile both filters

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

2015-01-05 15:55:47 +01:00

..

libmpcodecs

lavfi/mp: drop mp=fspp filter

2014-12-24 16:29:18 +01:00

x86

x86/vf_fspp: move pxor in store slice functions out of the loop

2014-12-26 17:15:34 -03:00

aeval.c

…

af_adelay.c

avfilter/af_adelay: use av_freep(), do not leave stale pointers in memory

2014-10-07 13:44:26 +02:00

af_aecho.c

…

af_afade.c

lavfi/afade: fix cur_sample computation

2014-10-21 13:28:08 +02:00

af_aformat.c

…

af_amerge.c

libavfilter/af_amerge: Do not depend on SWR_CH_MAX

2014-08-10 01:08:46 +02:00

af_amix.c

avfilter/af_amix: Use avpriv_float_dsp_alloc()

2014-11-18 12:24:16 +01:00

af_anull.c

…

af_apad.c

lavfi/apad: fix logic when whole_len or pad_len options are specified

2014-08-21 16:59:07 +02:00

af_aphaser.c

…

af_aresample.c

avfilter/af_aresample: remove unused variable

2014-11-06 15:58:28 +01:00

af_asetnsamples.c

…

af_asetrate.c

…

af_ashowinfo.c

…

af_astats.c

…

af_astreamsync.c

…

af_asyncts.c

…

af_atempo.c

avfilter/atempo: Flush all buffered input samples

2014-08-19 12:53:09 +02:00

af_biquads.c

avfilter/biquads: avoid clipping when using floating type

2014-07-21 03:48:18 +02:00

af_bs2b.c

…

af_channelmap.c

libavfilter/af_channelmap: avoid derreferencing possible null

2014-09-26 18:42:39 -03:00

af_channelsplit.c

…

af_compand.c

Merge commit 'd3cfd7aff86ee3d449ca68aba21d67b9b2136a9b'

2014-07-08 13:48:26 +02:00

af_earwax.c

…

af_flanger.c

…

af_join.c

libavfilter/af_join: avoid derreferencing possible null

2014-09-26 18:42:39 -03:00

af_ladspa.c

…

af_pan.c

avfilter/af_pan: Do not use SWR_CH_MAX

2014-08-10 01:08:45 +02:00

af_replaygain.c

…

af_resample.c

Merge commit '0d989dbfc4bc5bc1d563e967449116a7a9865258'

2014-10-18 22:04:36 +02:00

af_silencedetect.c

…

af_silenceremove.c

avfilter/af_silenceremove: remove dead code

2014-09-06 21:36:56 +02:00

af_volume.c

avfilter/af_volume: Use avpriv_float_dsp_alloc()

2014-11-18 12:38:38 +01:00

af_volume.h

avfilter/af_volume: Use avpriv_float_dsp_alloc()

2014-11-18 12:38:38 +01:00

af_volumedetect.c

…

all_channel_layouts.inc

…

allfilters.c

lavfi: add tblend filter

2014-12-27 16:15:24 +01:00

asink_anullsink.c

…

asrc_abuffer.h

…

asrc_anullsrc.c

…

asrc_flite.c

…

asrc_sine.c

…

audio.c

…

audio.h

…

avcodec.c

avfilter/avcodec: use NULL instead of 0 for pointer

2014-12-06 15:29:23 +01:00

avcodec.h

avfilter: remove obsolete FF_API_FILL_FRAME cruft

2014-09-17 15:23:26 -03:00

avf_avectorscope.c

…

avf_concat.c

avfilter/avf_concat: Use av_freep(), avoid leaving stale pointers in memory

2014-11-22 18:47:26 +01:00

avf_showcqt.c

avfilter/showcqt: add fontcolor option

2014-08-23 10:01:22 +02:00

avf_showspectrum.c

avfilter/avf_showspectrum: fix colums typo

2014-08-20 18:49:01 +02:00

avf_showwaves.c

avfilter/showwaves: fix height range for cline mode

2014-12-24 15:13:31 +01:00

avfilter.c

Add FFMPEG_VERSION into the binary libs

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

avfilter.h

…

avfiltergraph.c

avfilter: Properly check for failed format query

2014-10-02 12:22:49 +01:00

avfiltergraph.h

…

avfilterres.rc

…

bbox.c

…

bbox.h

…

buffer.c

…

bufferqueue.h

…

buffersink.c

…

buffersink.h

…

buffersrc.c

avfilter/buffersrc: add context to av_log() call

2014-12-06 15:31:05 +01:00

buffersrc.h

…

deshake_opencl_kernel.h

…

deshake_opencl.c

lavu: rename ff_opencl_set_parameter() to avpriv_opencl_set_parameter()

2014-08-12 03:49:45 +02:00

deshake_opencl.h

…

deshake.h

vf_deshake: rename Transform.vector to Transform.vec to avoid compiler confusion

2014-09-18 00:48:15 +02:00

drawutils.c

…

drawutils.h

…

dualinput.c

…

dualinput.h

…

f_ebur128.c

avfilter/ebur128: rework channel weighting definition code

2014-09-06 13:47:59 +02:00

f_interleave.c

…

f_perms.c

Add missing "const" all over the place.

2014-08-29 18:57:25 +02:00

f_select.c

avfilter/select: larger pixel sad computation

2014-08-14 19:11:13 +02:00

f_sendcmd.c

avfilter/f_sendcmd: Use av_freep() to avoid leaving stale pointers in memory

2014-12-14 15:54:45 +01:00

f_zmq.c

…

fifo.c

…

filtfmts.c

Merge commit '072916d903d3a925bcd0c864f12254157cab63c1'

2014-08-03 19:35:08 +02:00

formats.c

avfilter/formats: Alloc NULL fmts in SET_COMMON_FORMATS()

2014-11-21 22:15:32 +01:00

formats.h

…

framesync.c

…

framesync.h

…

generate_wave_table.c

…

generate_wave_table.h

…

gradfun.h

…

graphdump.c

…

graphparser.c

avfilter/graphparser: Use av_freep(), avoid leaving stale pointers in memory

2014-11-22 18:56:37 +01:00

interlace.h

Merge commit '2e1704059ae8625beda2ffde847ad22c5ba416dc'

2014-11-15 02:39:49 +01:00

internal.h

…

lavfutils.c

avfilter/lavfutils/ff_load_image: Return error if no frame could be decoded

2014-08-16 01:34:34 +02:00

lavfutils.h

…

libavfilter.v

lavfi: stop exporting internal functions

2014-08-10 04:51:19 +02:00

log2_tab.c

lavfi: duplicate ff_log2_tab

2014-08-13 01:00:38 +02:00

lswsutils.c

…

lswsutils.h

…

Makefile

lavfi: add tblend filter

2014-12-27 16:15:24 +01:00

opencl_allkernels.c

…

opencl_allkernels.h

…

pthread.c

…

setpts.c

Merge commit '593aaee953f8b07c141ff115e67bae85ef0350c7'

2014-08-21 21:47:43 +02:00

settb.c

…

split.c

…

src_movie.c

lavfi/src_movie: minor simplifications

2014-07-24 04:50:32 +02:00

thread.h

…

tinterlace.h

avfilter/vf_tinterlace: Favor using standard timebases for the output

2014-12-02 18:28:06 +01:00

transform.c

Factorize avpriv_mirror() out

2015-01-05 01:45:49 +01:00

transform.h

…

trim.c

avfilter/trim: remove duplicate assignment

2014-07-31 20:53:15 +02:00

unsharp_opencl_kernel.h

…

unsharp_opencl.c

lavu: rename ff_opencl_set_parameter() to avpriv_opencl_set_parameter()

2014-08-12 03:49:45 +02:00

unsharp_opencl.h

…

unsharp.h

…

version.h

lavfi: add tblend filter

2014-12-27 16:15:24 +01:00

vf_alphamerge.c

…

vf_aspect.c

…

vf_bbox.c

Use new av_dict_set_int helper function.

2014-08-16 14:31:41 +02:00

vf_blackdetect.c

lavfi: add const/static const to pix_fmts arrays.

2014-08-31 10:25:36 +02:00

vf_blackframe.c

Blackframe video filter now sets metadata accordingly.

2014-07-15 23:37:27 +02:00

vf_blend.c

libavfilter/vf_blend: do not unconditionally compile both filters

2015-01-05 14:14:54 +00:00

vf_boxblur.c

avfilter/vf_boxblur: generate supported pixfmt list instead of hardcoding

2014-12-26 15:09:59 +01:00

vf_codecview.c

avfilter: add codecview filter

2014-08-24 14:35:11 +02:00

vf_colorbalance.c

…

vf_colorchannelmixer.c

…

vf_colorlevels.c

lavfi: add colorlevels filter

2014-12-16 10:10:04 +00:00

vf_colormatrix.c

Add missing "const" all over the place.

2014-08-29 18:57:25 +02:00

vf_copy.c

…

vf_crop.c

…

vf_cropdetect.c

avfilter/vf_cropdetect: adjust Default threshold based on bit depth

2014-12-31 00:33:33 +01:00

vf_curves.c

…

vf_dctdnoiz.c

avfilter/vf_dctdnoiz: use av_freep() to avoid leaving stale pointers in memory

2014-12-14 15:56:32 +01:00

vf_decimate.c

avfilter/vf_decimate: Use av_malloc_array()

2014-07-11 15:32:27 +02:00

vf_dejudder.c

…

vf_delogo.c

…

vf_deshake.c

vf_deshake: rename Transform.vector to Transform.vec to avoid compiler confusion

2014-09-18 00:48:15 +02:00

vf_drawbox.c

…

vf_drawtext.c

avfilter/vf_drawtext: use gm_time_r() for thread saftey

2014-11-02 19:20:26 +01:00

vf_edgedetect.c

…

vf_elbg.c

…

vf_extractplanes.c

…

vf_fade.c

…

vf_field.c

…

vf_fieldmatch.c

…

vf_fieldorder.c

…

vf_format.c

Merge commit 'd1afd3e1d6e43f4d37ae147091f270124ac48e04'

2014-10-20 22:02:45 +02:00

vf_fps.c

vf_fps: Replace use of deprecated AVFilterBufferRef by AVFrame

2014-08-03 01:29:43 -07:00

vf_framepack.c

avfilter/framepack: use FF_CEIL_RSHIFT()

2014-12-30 14:25:41 +01:00

vf_framestep.c

…

vf_frei0r.c

…

vf_fspp.c

avfilter/vf_fspp: Add GBRP and gray8 support

2014-12-26 23:47:15 +01:00

vf_fspp.h

x86/vf_fspp: port inline asm to yasm

2014-12-26 15:39:51 -03:00

vf_geq.c

…

vf_gradfun.c

…

vf_hflip.c

…

vf_histeq.c

…

vf_histogram.c

…

vf_hqdn3d.c

…

vf_hqdn3d.h

…

vf_hqx.c

…

vf_hue.c

…

vf_idet.c

avfilter/vf_idet: Add 9, 12 and 14 bit pixel formats

2015-01-01 05:56:53 +01:00

vf_idet.h

avfilter/vf_idet: add a repeated field detection

2014-11-05 12:10:42 +01:00

vf_il.c

…

vf_interlace.c

Revert "avfilter/vf_interlace: more accurate pts calculation"

2014-12-02 18:48:03 +01:00

vf_kerndeint.c

avfilter/vf_kerndeint: use av_freep(), avoid leaving stale pointers in memory

2014-12-13 14:18:30 +01:00

vf_lenscorrection.c

lavfi: add const/static const to pix_fmts arrays.

2014-08-31 10:25:36 +02:00

vf_libopencv.c

avfilter/vf_libopencv: use av_freep() avoid leaving stale pointers in memory

2014-12-19 15:04:34 +01:00

vf_lut3d.c

…

vf_lut.c

avfilter/lut: reduce dereference in the inner loop

2014-12-18 21:54:23 +01:00

vf_mcdeint.c

…

vf_mergeplanes.c

…

vf_mp.c

lavfi/mp: drop mp=fspp filter

2014-12-24 16:29:18 +01:00

vf_mpdecimate.c

avfilter/mp_decimate: remove avcodec dependency

2014-08-05 21:05:52 +02:00

vf_noise.c

x86/vf_noise: move asm code to a separate file

2014-10-17 00:44:35 -03:00

vf_noise.h

x86/vf_noise: move asm code to a separate file

2014-10-17 00:44:35 -03:00

vf_null.c

…

vf_overlay.c

Add missing "const" all over the place.

2014-08-29 18:57:25 +02:00

vf_owdenoise.c

Factorize avpriv_mirror() out

2015-01-05 01:45:49 +01:00

vf_pad.c

…

vf_perspective.c

avfilter/vf_perspective: add av_assert0() to help gcc see that there are no uninitialized variables

2014-12-10 13:40:20 +01:00

vf_phase.c

…

vf_pixdesctest.c

…

vf_pp.c

avfilter/vf_pp: add gbrp support

2014-10-14 17:15:56 +02:00

vf_psnr.c

…

vf_pullup.c

avfilter/vf_pullup: 2nd try to workaround gcc 4.4.3 bug on arm

2014-08-01 14:17:53 +02:00

vf_pullup.h

…

vf_removelogo.c

…

vf_rotate.c

Add missing "const" all over the place.

2014-08-29 18:57:25 +02:00

vf_sab.c

Factorize avpriv_mirror() out

2015-01-05 01:45:49 +01:00

vf_scale.c

vf_scale: Use correct chroma positions for YUV420P

2014-12-25 02:53:29 +01:00

vf_separatefields.c

…

vf_setfield.c

…

vf_showinfo.c

Merge commit '6d96c7ea89600655b1f18a3b12f3f041fa714152'

2014-10-18 21:50:34 +02:00

vf_shuffleplanes.c

…

vf_signalstats.c

avfilter/vf_signalstats: fix avframe leak on error

2014-12-06 17:05:20 +01:00

vf_smartblur.c

…

vf_spp.c

avfilter/vf_spp: Fix overflow in 8bit store slice

2014-12-21 01:48:19 +01:00

vf_spp.h

avfilter/vf_spp: Fix overflow in 8bit store slice

2014-12-21 01:48:19 +01:00

vf_stereo3d.c

…

vf_subtitles.c

avfilter/ass: add shaping option

2014-09-16 21:23:33 +02:00

vf_super2xsai.c

…

vf_swapuv.c

…

vf_telecine.c

…

vf_thumbnail.c

…

vf_tile.c

…

vf_tinterlace.c

avfilter/vf_tinterlace: Favor using standard timebases for the output

2014-12-02 18:28:06 +01:00

vf_transpose.c

…

vf_unsharp.c

avfilter/vf_unsharp: use av_freep() avoid leaving stale pointers in memory

2014-12-13 14:18:30 +01:00

vf_uspp.c

avfilter/vf_uspp: clear AVPacket to not leave uninitialized memory

2014-12-30 15:15:36 +01:00

vf_vflip.c

…

vf_vidstabdetect.c

avfilter: Read errno before av_log() as the callback from av_log() might affect errno

2014-10-25 13:28:51 +02:00

vf_vidstabtransform.c

avfilter: Read errno before av_log() as the callback from av_log() might affect errno

2014-10-25 13:28:51 +02:00

vf_vignette.c

…

vf_w3fdif.c

…

vf_xbr.c

avfilter/xbr: reindent after previous commit

2014-12-25 23:50:25 +01:00

vf_yadif.c

avfilter/vf_yadif: add >8bit planar rgb formats

2014-12-30 22:52:45 +01:00

vf_zoompan.c

…

video.c

Merge commit '67a7695c142561fe60f21adffe89c133385d37c9'

2014-08-20 00:23:15 +02:00

video.h

…

vidstabutils.c

vidstab*: Remove accidentally exported av_2_vs_pixel_format()

2014-08-22 22:18:46 +02:00

vidstabutils.h

vidstabutils: improve documentation

2014-08-22 22:19:20 +02:00

vsink_nullsink.c

…

vsrc_cellauto.c

…

vsrc_life.c

avfilter/vsrc_life: Use av_freep() avoid leaving stale pointers in memory

2014-12-19 15:04:56 +01:00

vsrc_mandelbrot.c

…

vsrc_mptestsrc.c

…

vsrc_testsrc.c

…

yadif.h

…