Michael Niedermayer 3a4c22f806 Merge commit '6d96c7ea89600655b1f18a3b12f3f041fa714152' ...

* commit '6d96c7ea89600655b1f18a3b12f3f041fa714152':
  vf_showinfo: Forward the av_image_get_linesize error

Conflicts:
	libavfilter/vf_showinfo.c

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

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

..

libmpcodecs

Drop remaining unneeded != NULL

2014-08-15 22:47:45 +02:00

x86

x86/vf_noise: move asm code to a separate file

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

aeval.c

avfilter/aeval: silence "may be used uninitialized" warning

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

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

…

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

libavfilter/af_amix: avoid derreferencing possible null

2014-09-26 18:42:39 -03: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

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

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

af_aresample.c

avfilter/aresample: Check for memory alloc failure for out sample rates

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

af_asetnsamples.c

avfilter/af_asetnsamples: fix pts handling when timebase and 1/samplerate differ

2014-06-14 04:24:13 +02:00

af_asetrate.c

…

af_ashowinfo.c

Merge remote-tracking branch 'qatar/master'

2014-04-05 00:42:47 +02:00

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

avfilter/af_bs2b: Fix incompatible pointer type warnings

2014-05-06 01:01:02 +02:00

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

avfilter: add flanger filter

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

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 '6cbbf0592f4f3940aac7f687850d1b726a2ea836'

2014-10-18 12:47:37 +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

Add missing "const" all over the place.

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

af_volume.h

Merge commit 'aaab192df24a90f4450285cfb73b395cf495b462'

2014-04-13 14:39:51 +02:00

af_volumedetect.c

…

all_channel_layouts.inc

…

allfilters.c

avfilter: remove obsolete FF_API_ACONVERT_FILTER cruft

2014-09-17 07:43:03 +00:00

asink_anullsink.c

…

asrc_abuffer.h

…

asrc_anullsrc.c

…

asrc_flite.c

…

asrc_sine.c

…

audio.c

avfilter/audio: use av_mallocz_array()

2014-05-03 20:08:18 +02:00

audio.h

…

avcodec.c

avfilter: remove obsolete FF_API_FILL_FRAME cruft

2014-09-17 15:23:26 -03: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

…

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: align const mode values (cosmetics)

2014-08-20 22:32:06 +02:00

avfilter.c

avfilter: add w/h parameters in timeline

2014-10-07 15:05:50 +02:00

avfilter.h

lavfi/avfilter: clarify avfilter_graph_get_filter() doxygen

2014-04-26 02:16:56 +02:00

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

avfilter/buffer: Use av_malloc_array()

2014-05-12 12:24:41 +02:00

bufferqueue.h

avfilter/bufferqueue: Increase buffer queue size

2014-06-04 18:41:04 +02:00

buffersink.c

lavfi/buffersink: use av_fifo_alloc_array

2014-05-20 00:00:44 +02:00

buffersink.h

…

buffersrc.c

avfilter/buffersrc: reindent

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

buffersrc.h

fix various typos

2014-06-03 10:58:19 -08:00

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

avfilter/vf_drawtext: Avoid using non public AV_PIX_FMT_NB

2014-05-27 17:52:24 +02:00

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

…

f_zmq.c

…

fifo.c

Merge commit '58400ac133bcfb6bf8196b4e5208bc178307739b'

2014-04-19 18:20:17 +02:00

filtfmts.c

Merge commit '072916d903d3a925bcd0c864f12254157cab63c1'

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

formats.c

avfilter/formats: Use av_realloc_array()

2014-06-13 23:15:16 +02:00

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

avfilter/graphdump: Fix pointer to local outside scope

2014-04-28 04:01:50 +02:00

graphparser.c

…

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

avfilter: remove obsolete FF_API_ACONVERT_FILTER cruft

2014-09-17 07:43:03 +00:00

opencl_allkernels.c

…

opencl_allkernels.h

…

pthread.c

avfilter/pthread: Use av_mallocz_array()

2014-04-22 02:40:20 +02:00

setpts.c

Merge commit '593aaee953f8b07c141ff115e67bae85ef0350c7'

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

settb.c

Merge commit '58400ac133bcfb6bf8196b4e5208bc178307739b'

2014-04-19 18:20:17 +02:00

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

lavu: rename ff_opencl_set_parameter() to avpriv_opencl_set_parameter()

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

unsharp_opencl.h

…

unsharp.h

Merge commit '58400ac133bcfb6bf8196b4e5208bc178307739b'

2014-04-19 18:20:17 +02:00

version.h

avfilter/vf_pp: add gbrp support

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

vf_alphamerge.c

…

vf_aspect.c

Merge commit '58400ac133bcfb6bf8196b4e5208bc178307739b'

2014-04-19 18:20:17 +02:00

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

avfilter/vf_blend: fix macro ()

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

vf_boxblur.c

Merge commit '58400ac133bcfb6bf8196b4e5208bc178307739b'

2014-04-19 18:20:17 +02:00

vf_codecview.c

avfilter: add codecview filter

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

vf_colorbalance.c

…

vf_colorchannelmixer.c

…

vf_colormatrix.c

Add missing "const" all over the place.

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

vf_copy.c

…

vf_crop.c

avfilter/crop: Avoid using non public AV_PIX_FMT_NB

2014-05-27 17:43:32 +02:00

vf_cropdetect.c

avfilter/vf_cropdetect: Do not check lines or columns twice on black frames

2014-09-09 02:06:17 +02:00

vf_curves.c

avfilter/curves: fix resource leaks.

2014-04-27 11:49:13 +02:00

vf_dctdnoiz.c

avfilter/dctdnoiz: add slice threading

2014-08-13 19:32:00 +02:00

vf_decimate.c

avfilter/vf_decimate: Use av_malloc_array()

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

vf_dejudder.c

avfilter/vf_dejudder: Use av_mallocz_array()

2014-06-13 23:14:38 +02:00

vf_delogo.c

Merge commit '58400ac133bcfb6bf8196b4e5208bc178307739b'

2014-04-19 18:20:17 +02:00

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

Merge commit '58400ac133bcfb6bf8196b4e5208bc178307739b'

2014-04-19 18:20:17 +02:00

vf_drawtext.c

Merge commit 'f401792595dd7760f531e8a3bd2336e9033bd45a'

2014-10-18 21:33:04 +02:00

vf_edgedetect.c

avfilter/edgedetect: reuse already defined ctx.

2014-05-17 14:16:04 +02:00

vf_elbg.c

Merge commit '58400ac133bcfb6bf8196b4e5208bc178307739b'

2014-04-19 18:20:17 +02:00

vf_extractplanes.c

…

vf_fade.c

Merge commit '58400ac133bcfb6bf8196b4e5208bc178307739b'

2014-04-19 18:20:17 +02:00

vf_field.c

…

vf_fieldmatch.c

…

vf_fieldorder.c

Merge commit 'a7d070acb55c3ebbdd5e93e3366f32865732b8a3'

2014-05-27 03:02:37 +02:00

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

Merge commit '58400ac133bcfb6bf8196b4e5208bc178307739b'

2014-04-19 18:20:17 +02:00

vf_frei0r.c

…

vf_geq.c

…

vf_gradfun.c

…

vf_hflip.c

avfilter/hflip: Avoid using non public AV_PIX_FMT_NB

2014-05-27 17:43:46 +02:00

vf_histeq.c

…

vf_histogram.c

…

vf_hqdn3d.c

avfilter/vf_hqdn3: use av_malloc_array()

2014-05-14 06:17:05 +02:00

vf_hqdn3d.h

Merge commit '58400ac133bcfb6bf8196b4e5208bc178307739b'

2014-04-19 18:20:17 +02:00

vf_hqx.c

avfilter/vf_hqx: optimize table init

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

vf_hue.c

…

vf_idet.c

avfilter/idet: typo fix: PROGRSSIVE -> PROGRESSIVE

2014-09-20 12:09:14 +02:00

vf_idet.h

avfilter/idet: typo fix: PROGRSSIVE -> PROGRESSIVE

2014-09-20 12:09:14 +02:00

vf_il.c

avfilter/il: Avoid using non public AV_PIX_FMT_NB

2014-05-27 17:44:02 +02:00

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_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_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

Merge commit '58400ac133bcfb6bf8196b4e5208bc178307739b'

2014-04-19 18:20:17 +02:00

vf_mcdeint.c

…

vf_mergeplanes.c

avfilter/vf_mergeplanes: Avoid using non public AV_PIX_FMT_NB

2014-05-27 17:44:15 +02:00

vf_mp.c

avfilter/vf_mp: remove incorrect usage of AVFrame.type

2014-08-30 12:16:46 +02: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

avfilter/vf_owdenoise: use av_malloc_array()

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

vf_pad.c

Merge commit '58400ac133bcfb6bf8196b4e5208bc178307739b'

2014-04-19 18:20:17 +02:00

vf_perspective.c

avfitler/vf_perspective: support slice threading

2014-08-13 14:04:21 +00:00

vf_phase.c

avfilter/phase: make the main loop readable.

2014-05-08 23:58:34 +02:00

vf_pixdesctest.c

Merge commit '58400ac133bcfb6bf8196b4e5208bc178307739b'

2014-04-19 18:20:17 +02:00

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

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

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

vf_removelogo.c

avfilter/vf_removelogo: use av_malloc_array()

2014-05-14 06:17:27 +02:00

vf_rotate.c

Add missing "const" all over the place.

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

vf_sab.c

vf_sab: use av_malloc_array()

2014-06-18 00:07:12 +02:00

vf_scale.c

avfilter/vf_scale: Allow chroma samples to be above and to the left of luma samples

2014-09-21 12:24:03 +02:00

vf_separatefields.c

…

vf_setfield.c

…

vf_showinfo.c

Merge commit '6d96c7ea89600655b1f18a3b12f3f041fa714152'

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

vf_shuffleplanes.c

avfilter/vf_shuffleplanes: Fix flags / add AV_OPT_FLAG_FILTERING_PARAM

2014-03-06 16:58:24 +01:00

vf_signalstats.c

avfilter/signalstats: add more pixel formats

2014-09-27 07:28:06 +00:00

vf_smartblur.c

fix various typos

2014-06-03 10:58:19 -08:00

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

avfilter/ass: add shaping option

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

vf_super2xsai.c

…

vf_swapuv.c

avfilter/vf_swapuv: Avoid using non public AV_PIX_FMT_NB

2014-05-27 17:45:07 +02:00

vf_telecine.c

avfilter/vf_telecine: Avoid using non public AV_PIX_FMT_NB

2014-05-27 17:45:36 +02:00

vf_thumbnail.c

…

vf_tile.c

…

vf_tinterlace.c

lavfi: add const/static const to pix_fmts arrays.

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

vf_transpose.c

avfilter/vf_transpose: Avoid using non public AV_PIX_FMT_NB

2014-05-27 17:45:21 +02:00

vf_unsharp.c

avfilter/vf_unsharp: use av_malloc_array()

2014-06-13 23:14:18 +02:00

vf_vflip.c

Merge commit '58400ac133bcfb6bf8196b4e5208bc178307739b'

2014-04-19 18:20:17 +02:00

vf_vidstabdetect.c

vidstab*: Remove accidentally exported av_2_vs_pixel_format()

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

vf_vidstabtransform.c

vidstab*: Remove accidentally exported av_2_vs_pixel_format()

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

vf_vignette.c

avfilter/vf_vignette: Use av_malloc_array()

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

vf_w3fdif.c

…

vf_yadif.c

vfilter/vf_yadif: fix request_frame after 0f9f24c9

2014-05-03 16:14:32 +02:00

vf_zoompan.c

avfilter/vf_zoompan: fix mixing of declarations and statements

2014-06-09 17:27:34 +02:00

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

avfilter/vsrc_cellauto: Use av_mallocz_array()

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

vsrc_life.c

…

vsrc_mandelbrot.c

avfilter/vsrc_mandelbrot: use av_malloc_array()

2014-05-15 01:54:36 +02:00

vsrc_mptestsrc.c

…

vsrc_testsrc.c

Merge commit '58400ac133bcfb6bf8196b4e5208bc178307739b'

2014-04-19 18:20:17 +02:00

yadif.h

…