Michael Niedermayer 71d008ebe4 Merge commit '1ef9e8376466bb1e2c147e47554b94cab9c8b04a' ...

* commit '1ef9e8376466bb1e2c147e47554b94cab9c8b04a':
  avcodec: Deprecate dtg_active_format field in favor of avframe side-data

Conflicts:
	doc/APIchanges
	libavcodec/avcodec.h
	libavcodec/mpeg12dec.c
	libavcodec/version.h
	libavfilter/vf_showinfo.c
	libavutil/frame.h
	libavutil/version.h

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

2014-08-04 06:11:34 +02:00

..

libmpcodecs

Merge commit '2d60444331fca1910510038dd3817bea885c2367'

2014-07-17 23:27:40 +02:00

x86

fix spelling errors

2014-07-12 22:33:27 +02:00

aeval.c

…

af_aconvert.c

…

af_adelay.c

…

af_aecho.c

…

af_afade.c

…

af_aformat.c

…

af_amerge.c

…

af_amix.c

…

af_anull.c

…

af_apad.c

…

af_aphaser.c

avfilter/af_aphaser: move wave table generation code into separate file

2014-07-03 07:34:11 +00:00

af_aresample.c

…

af_asetnsamples.c

…

af_asetrate.c

…

af_ashowinfo.c

…

af_astats.c

…

af_astreamsync.c

…

af_asyncts.c

…

af_atempo.c

…

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

Merge commit 'f0e959481968b6d906931127237ed981b6414f6e'

2014-08-02 04:47:31 +02:00

af_channelsplit.c

…

af_compand.c

Merge commit 'd3cfd7aff86ee3d449ca68aba21d67b9b2136a9b'

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

af_earwax.c

…

af_flanger.c

avfilter: add flanger filter

2014-07-03 08:07:42 +00:00

af_join.c

Merge commit '87efaa97ceb0ad5820870855d6df3e569e6eac7e'

2014-08-02 04:45:26 +02:00

af_ladspa.c

…

af_pan.c

…

af_replaygain.c

…

af_resample.c

…

af_silencedetect.c

…

af_volume.c

…

af_volume.h

…

af_volumedetect.c

…

all_channel_layouts.inc

…

allfilters.c

avfilter: add flanger filter

2014-07-03 08:07:42 +00: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

…

avf_concat.c

…

avf_showcqt.c

avfilter/showcqt: adding freetype support

2014-06-30 21:53:14 +02:00

avf_showspectrum.c

avfilter/avf_showspectrum: fix macro ()

2014-06-21 23:11:16 +02:00

avf_showwaves.c

…

avfilter.c

avfilter/avfilter: use av_malloc(z)_array()

2014-07-19 19:42:46 +02:00

avfilter.h

…

avfiltergraph.c

lavfi: check refcount before merging.

2014-07-17 18:12:34 +02:00

avfiltergraph.h

…

avfilterres.rc

…

bbox.c

…

bbox.h

…

buffer.c

…

bufferqueue.h

…

buffersink.c

…

buffersink.h

…

buffersrc.c

avfilter/buffersrc: reindent

2014-06-29 13:26:04 +02:00

buffersrc.h

…

deshake_opencl_kernel.h

…

deshake_opencl.c

avfilter/deshake_opencl: fix macro ()

2014-06-21 23:11:16 +02:00

deshake_opencl.h

…

deshake.h

reintroduce avpriv_dsputil_init() to maintain ABI until next soname bump

2014-07-26 13:21:07 +02:00

drawutils.c

…

drawutils.h

…

dualinput.c

…

dualinput.h

…

f_ebur128.c

avfilter/f_ebur128: Use av_malloc_array()

2014-07-01 03:50:53 +02:00

f_interleave.c

…

f_perms.c

…

f_select.c

avfilter/f_select: avoid double->int in debug output

2014-07-30 17:50:35 +02:00

f_sendcmd.c

…

f_zmq.c

…

fifo.c

…

filtfmts.c

Merge commit '072916d903d3a925bcd0c864f12254157cab63c1'

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

formats.c

…

formats.h

…

framesync.c

…

framesync.h

…

generate_wave_table.c

avfilter/af_aphaser: move wave table generation code into separate file

2014-07-03 07:34:11 +00:00

generate_wave_table.h

avfilter/af_aphaser: move wave table generation code into separate file

2014-07-03 07:34:11 +00:00

gradfun.h

…

graphdump.c

…

graphparser.c

…

internal.h

…

lavfutils.c

avfilter/lavfutils: remove redundant variable init

2014-08-02 20:03:10 +02:00

lavfutils.h

…

libavfilter.v

…

lswsutils.c

…

lswsutils.h

…

Makefile

avfilter: add flanger filter

2014-07-03 08:07:42 +00:00

opencl_allkernels.c

…

opencl_allkernels.h

…

pthread.c

…

setpts.c

…

settb.c

…

split.c

…

src_movie.c

lavfi/src_movie: minor simplifications

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

thread.h

…

transform.c

…

transform.h

…

trim.c

avfilter/trim: remove duplicate assignment

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

unsharp_opencl_kernel.h

…

unsharp_opencl.c

avfilter/unsharp_opencl: use av_mallocz_array()

2014-07-06 14:33:54 +02:00

unsharp_opencl.h

…

unsharp.h

…

version.h

Merge commit '52269f48e835a52023656f8330262ae70e6061c4'

2014-08-01 16:39:28 +02:00

vf_alphamerge.c

…

vf_aspect.c

…

vf_bbox.c

…

vf_blackdetect.c

…

vf_blackframe.c

Blackframe video filter now sets metadata accordingly.

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

vf_blend.c

avfilter/vf_blend: fix macro ()

2014-06-22 20:49:00 +02:00

vf_boxblur.c

…

vf_colorbalance.c

…

vf_colorchannelmixer.c

…

vf_colormatrix.c

avfilter/vf_colormatrix: fix macro ()

2014-06-24 21:43:40 +02:00

vf_copy.c

…

vf_crop.c

…

vf_cropdetect.c

…

vf_curves.c

…

vf_dctdnoiz.c

…

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

reintroduce avpriv_dsputil_init() to maintain ABI until next soname bump

2014-07-26 13:21:07 +02:00

vf_drawbox.c

…

vf_drawtext.c

lavfi/drawtext: add alias "expr_int_format" to expansion function "eif"

2014-07-18 14:24:34 +02: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

avfilter/vf_format: Check pix_fmts before dereferencing it

2014-07-03 02:29:49 +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

…

vf_framestep.c

…

vf_frei0r.c

…

vf_geq.c

…

vf_gradfun.c

…

vf_hflip.c

…

vf_histeq.c

…

vf_histogram.c

…

vf_hqdn3d.c

…

vf_hqdn3d.h

…

vf_hqx.c

avfilter/vf_hqx: optimize table init

2014-06-24 03:16:53 +02:00

vf_hue.c

…

vf_idet.c

…

vf_il.c

…

vf_interlace.c

Merge commit '52269f48e835a52023656f8330262ae70e6061c4'

2014-08-01 16:39:28 +02:00

vf_kerndeint.c

kerndeint: remove dead assignments

2014-07-18 04:44:58 +02:00

vf_libopencv.c

avfilter/vf_libopencv: Use av_mallocz_array()

2014-07-11 15:00:49 +02:00

vf_lut3d.c

avfilter/haldclut: fix R/B swap in CLUT loading

2014-07-05 19:35:51 +02:00

vf_lut.c

…

vf_mcdeint.c

…

vf_mergeplanes.c

…

vf_mp.c

…

vf_mpdecimate.c

reintroduce avpriv_dsputil_init() to maintain ABI until next soname bump

2014-07-26 13:21:07 +02:00

vf_noise.c

…

vf_null.c

…

vf_overlay.c

lavfi/overlay: show incoming frames on debug messages

2014-07-02 18:42:15 +02:00

vf_owdenoise.c

avfilter/vf_owdenoise: use av_malloc_array()

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

vf_pad.c

…

vf_perspective.c

…

vf_phase.c

…

vf_pixdesctest.c

…

vf_pp.c

…

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

avfilter/vf_pullup: use ptrdiff_t as stride argument for dsp functions

2014-06-25 18:22:31 +02:00

vf_removelogo.c

…

vf_rotate.c

…

vf_sab.c

…

vf_scale.c

avfilter/vf_scale: fix log message category

2014-07-28 05:15:16 +02:00

vf_separatefields.c

…

vf_setfield.c

…

vf_showinfo.c

Merge commit '1ef9e8376466bb1e2c147e47554b94cab9c8b04a'

2014-08-04 06:11:34 +02:00

vf_shuffleplanes.c

…

vf_signalstats.c

…

vf_smartblur.c

…

vf_spp.c

avfilter/vf_spp: Use dct->get_pixels()

2014-08-03 23:36:01 +02:00

vf_spp.h

avfilter/vf_spp: Use dct->get_pixels()

2014-08-03 23:36:01 +02:00

vf_stereo3d.c

…

vf_subtitles.c

…

vf_super2xsai.c

…

vf_swapuv.c

…

vf_telecine.c

…

vf_thumbnail.c

…

vf_tile.c

…

vf_tinterlace.c

…

vf_transpose.c

…

vf_unsharp.c

…

vf_vflip.c

…

vf_vidstabdetect.c

…

vf_vidstabtransform.c

…

vf_vignette.c

avfilter/vf_vignette: Use av_malloc_array()

2014-07-06 14:34:37 +02:00

vf_w3fdif.c

…

vf_yadif.c

…

vf_zoompan.c

…

video.c

…

video.h

…

vidstabutils.c

…

vidstabutils.h

…

vsink_nullsink.c

…

vsrc_cellauto.c

avfilter/vsrc_cellauto: Use av_mallocz_array()

2014-07-06 14:35:13 +02:00

vsrc_life.c

…

vsrc_mandelbrot.c

…

vsrc_mptestsrc.c

…

vsrc_testsrc.c

…

yadif.h

…