Michael Niedermayer 87b9dc0982 Merge commit '565e4993c63f797e2d50ad2f1e8f62fdbe299666' ...

The commit has already been split and commited, this merge is just for metadata.
What has not been merged is the removial of some start/end_frame / draw_slice
related functions that are still in use. They can be removed once they are
unused.

* commit '565e4993c63f797e2d50ad2f1e8f62fdbe299666':
  lavfi: merge start_frame/draw_slice/end_frame

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

2012-11-29 02:51:22 +01:00

..

libmpcodecs

lavfi/mp/pp: use PP_CPU_CAPS_AUTO.

2012-11-18 16:21:59 +01:00

x86

Merge commit 'fa8fcab1e0d31074c0644c4ac5194474c6c26415'

2012-11-01 13:11:51 +01:00

af_aconvert.c

lavfi: convert remaining input/output list compound literals to named objects.

2012-11-28 23:19:20 +01:00

af_aformat.c

Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88'

2012-11-12 11:32:11 +01:00

af_amerge.c

lavfi: convert remaining input/output list compound literals to named objects.

2012-11-28 23:19:20 +01:00

af_amix.c

lavfi: replace filter_samples by filter_frame

2012-11-28 16:43:34 +01:00

af_anull.c

Merge commit '4436f25a1682ada3f7226cb6fadf429946933161'

2012-10-11 15:46:48 +02:00

af_aresample.c

lavfi: convert remaining input/output list compound literals to named objects.

2012-11-28 23:19:20 +01:00

af_asetnsamples.c

lavfi: convert remaining input/output list compound literals to named objects.

2012-11-28 23:19:20 +01:00

af_ashowinfo.c

Merge commit '565e4993c63f797e2d50ad2f1e8f62fdbe299666'

2012-11-29 02:51:22 +01:00

af_astreamsync.c

lavfi: convert remaining input/output list compound literals to named objects.

2012-11-28 23:19:20 +01:00

af_asyncts.c

lavfi: replace filter_samples by filter_frame

2012-11-28 16:43:34 +01:00

af_atempo.c

lavfi: convert remaining input/output list compound literals to named objects.

2012-11-28 23:19:20 +01:00

af_channelmap.c

lavfi: replace filter_samples by filter_frame

2012-11-28 16:43:34 +01:00

af_channelsplit.c

lavfi: replace filter_samples by filter_frame

2012-11-28 16:43:34 +01:00

af_earwax.c

lavfi: convert remaining input/output list compound literals to named objects.

2012-11-28 23:19:20 +01:00

af_join.c

lavfi: replace filter_samples by filter_frame

2012-11-28 16:43:34 +01:00

af_pan.c

lavfi: convert remaining input/output list compound literals to named objects.

2012-11-28 23:19:20 +01:00

af_resample.c

lavfi: replace filter_samples by filter_frame

2012-11-28 16:43:34 +01:00

af_silencedetect.c

lavfi: convert remaining input/output list compound literals to named objects.

2012-11-28 23:19:20 +01:00

af_volume.c

lavfi: convert remaining input/output list compound literals to named objects.

2012-11-28 23:19:20 +01:00

af_volumedetect.c

lavfi: convert remaining input/output list compound literals to named objects.

2012-11-28 23:19:20 +01:00

all_channel_layouts.inc

lavfi: rename all_channel_layouts.h to all_channel_layouts.inc.

2012-05-18 23:34:11 +02:00

allfilters.c

Merge commit 'bb6c67bb36b136de10256f0999128df4a42f9ffc'

2012-11-28 23:59:15 +01:00

asink_anullsink.c

lavfi: replace filter_samples by filter_frame

2012-11-28 16:43:34 +01:00

asrc_abuffer.h

asrc_abuffer: deprecate the header.

2012-05-06 16:18:10 +02:00

asrc_aevalsrc.c

lavfi: convert remaining input/output list compound literals to named objects.

2012-11-28 23:19:20 +01:00

asrc_anullsrc.c

lavfi: replace filter_samples by filter_frame

2012-11-28 16:43:34 +01:00

asrc_flite.c

lavfi: convert remaining input/output list compound literals to named objects.

2012-11-28 23:19:20 +01:00

audio.c

libavfilter: Support using filter_frame for video

2012-11-28 16:43:34 +01:00

audio.h

libavfilter: Support using filter_frame for video

2012-11-28 16:43:34 +01:00

avcodec.c

replace av_log(0, by av_log(NULL,

2012-11-23 18:10:02 +01:00

avcodec.h

lavfi: add avfilter_get_buffer_ref_from_frame.

2012-07-23 17:14:59 +02:00

avf_concat.c

lavfi: convert remaining input/output list compound literals to named objects.

2012-11-28 23:19:20 +01:00

avf_showspectrum.c

lavfi: convert remaining input/output list compound literals to named objects.

2012-11-28 23:19:20 +01:00

avf_showwaves.c

lavfi: convert remaining input/output list compound literals to named objects.

2012-11-28 23:19:20 +01:00

avfilter.c

Merge commit '565e4993c63f797e2d50ad2f1e8f62fdbe299666'

2012-11-29 02:51:22 +01:00

avfilter.h

avfilter: mark start_frame/end_frame/draw_slice as deprecated

2012-11-29 02:30:11 +01:00

avfiltergraph.c

avfiltergraph: add aresample_swr_opts

2012-11-26 03:51:08 +01:00

avfiltergraph.h

avfiltergraph: add aresample_swr_opts

2012-11-26 03:51:08 +01:00

bbox.c

…

bbox.h

…

buffer.c

Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88'

2012-11-12 11:32:11 +01:00

bufferqueue.h

lavfi: add a generic API for buffer queues.

2012-05-31 17:27:27 +02:00

buffersink.c

buffersink: switch to filter_frame

2012-11-29 01:55:26 +01:00

buffersink.h

Merge commit '716d413c13981da15323c7a3821860536eefdbbb'

2012-10-08 21:06:57 +02:00

buffersrc.c

buffersrc: switch to filter_frame

2012-11-29 01:55:26 +01:00

buffersrc.h

Merge commit '23aae62c2cb4504a09ceb8cd0cabc1c8b260f521'

2012-09-18 14:45:44 +02:00

drawutils.c

Merge commit 'd1d9efaae6c7e8466b06c30ca21c6b569dd2e480'

2012-11-21 15:37:01 +01:00

drawutils.h

Merge commit '716d413c13981da15323c7a3821860536eefdbbb'

2012-10-08 21:06:57 +02:00

f_ebur128.c

lavfi: add priv_class for some forgotten filters.

2012-11-29 00:50:37 +01:00

f_sendcmd.c

lavfi/sendcmd: expose the options for both filters.

2012-11-29 00:52:00 +01:00

f_setpts.c

lavfi: convert remaining input/output list compound literals to named objects.

2012-11-28 23:19:20 +01:00

f_settb.c

lavfi: convert remaining input/output list compound literals to named objects.

2012-11-28 23:19:20 +01:00

fifo.c

libavfilter/fifo: fix indent

2012-11-28 19:18:24 +01:00

filtfmts.c

lavfi: do not use av_pix_fmt_descriptors directly.

2012-10-12 12:45:39 +02:00

formats.c

replace av_log(0, by av_log(NULL,

2012-11-23 18:10:02 +01:00

formats.h

Fix misspellings of FFmpeg

2012-07-19 18:44:46 +02:00

gradfun.h

Merge remote-tracking branch 'qatar/master'

2012-10-06 13:45:08 +02:00

graphdump.c

Replace rest of libavutil/audioconvert.h with libavutil/channel_layout.h

2012-11-13 13:21:21 +00:00

graphparser.c

Merge commit '1b891d17c531e8a63c2974aab4bf997ce70746f3'

2012-10-26 14:24:57 +02:00

internal.h

libavfilter: update doxy for filter_frame

2012-11-28 16:43:34 +01:00

lavfutils.c

libavfilter/lavfutils: remove useless NULL check on format context

2012-10-17 20:00:31 +02:00

lavfutils.h

Merge commit '716d413c13981da15323c7a3821860536eefdbbb'

2012-10-08 21:06:57 +02:00

libavfilter.v

libavfilter: export ff_default_query_formats()

2012-05-25 18:54:01 +02:00

lswsutils.c

Merge commit '716d413c13981da15323c7a3821860536eefdbbb'

2012-10-08 21:06:57 +02:00

lswsutils.h

Merge commit '716d413c13981da15323c7a3821860536eefdbbb'

2012-10-08 21:06:57 +02:00

Makefile

Merge commit 'bb6c67bb36b136de10256f0999128df4a42f9ffc'

2012-11-28 23:59:15 +01:00

sink_buffer.c

lavfi: convert remaining input/output list compound literals to named objects.

2012-11-28 23:19:20 +01:00

split.c

libavfilter/split: switch to filter_frame

2012-11-29 01:20:53 +01:00

src_buffer.c

Replace rest of libavutil/audioconvert.h with libavutil/channel_layout.h

2012-11-13 13:21:21 +00:00

src_movie.c

lavfi: convert remaining input/output list compound literals to named objects.

2012-11-28 23:19:20 +01:00

transform.c

transform: give avfilter_transform() a return value for returning an error

2012-11-04 01:30:16 +01:00

transform.h

transform: give avfilter_transform() a return value for returning an error

2012-11-04 01:30:16 +01:00

version.h

lavfi/drawtext: add support to expansion of generic expressions

2012-11-27 23:27:50 +01:00

vf_alphaextract.c

lavfi: convert remaining input/output list compound literals to named objects.

2012-11-28 23:19:20 +01:00

vf_alphamerge.c

lavfi: convert remaining input/output list compound literals to named objects.

2012-11-28 23:19:20 +01:00

vf_aspect.c

vf_aspect: switch to filter_frame

2012-11-29 00:31:50 +01:00

vf_ass.c

lavfi/ass: switch to filter_frame.

2012-11-29 02:36:34 +01:00

vf_bbox.c

lavfi: convert remaining input/output list compound literals to named objects.

2012-11-28 23:19:20 +01:00

vf_blackdetect.c

lavfi: convert remaining input/output list compound literals to named objects.

2012-11-28 23:19:20 +01:00

vf_blackframe.c

vf_blackframe: switch to filter_frame

2012-11-29 00:32:08 +01:00

vf_boxblur.c

vf_boxblur: cosmetics to reduce diff to qatar

2012-11-28 19:18:24 +01:00

vf_colormatrix.c

lavfi/colormatrix: 10l fix forgotten buffer unref.

2012-11-29 02:21:16 +01:00

vf_copy.c

vf_copy: switch to filter_frame

2012-11-29 02:09:22 +01:00

vf_crop.c

vf_crop: switch to filter_frame

2012-11-29 00:15:40 +01:00

vf_cropdetect.c

vf_cropdetect: switch to filter_frame

2012-11-29 00:15:56 +01:00

vf_decimate.c

lavfi: convert remaining input/output list compound literals to named objects.

2012-11-28 23:19:20 +01:00

vf_delogo.c

lavfi: add priv_class for some forgotten filters.

2012-11-29 00:50:37 +01:00

vf_deshake.c

lavfi: convert remaining input/output list compound literals to named objects.

2012-11-28 23:19:20 +01:00

vf_drawbox.c

vf_drawbox: switch to filter frame

2012-11-29 00:09:53 +01:00

vf_drawtext.c

vf_drawtext: switch to filter_frame, this filter did not support slices

2012-11-28 18:07:51 +01:00

vf_edgedetect.c

lavfi: add priv_class for some forgotten filters.

2012-11-29 00:50:37 +01:00

vf_fade.c

vf_fade: switch to filter_frame

2012-11-28 23:47:01 +01:00

vf_field.c

lavfi: add field filter

2012-10-31 12:07:11 +01:00

vf_fieldorder.c

vf_fieldorder: switch to filter_frame, this filter did not support real slices

2012-11-28 19:23:32 +01:00

vf_format.c

vf_format: switch to filter_frame

2012-11-29 02:09:40 +01:00

vf_fps.c

vf_fps: switch to filter_frame

2012-11-28 19:28:41 +01:00

vf_framestep.c

lavfi: convert remaining input/output list compound literals to named objects.

2012-11-28 23:19:20 +01:00

vf_frei0r.c

vf_frei0r: switch to filter_frame, the filter did not support slices

2012-11-28 20:06:06 +01:00

vf_geq.c

lavfi/geq: switch to filter_frame.

2012-11-28 20:20:40 +01:00

vf_gradfun.c

vf_gradfun: switch to filter_frame, this filter did not support slices

2012-11-28 20:06:06 +01:00

vf_hflip.c

vf_hflip: switch to filter_frame

2012-11-28 22:39:16 +01:00

vf_hqdn3d.c

vf_hqdn3d: fix permissions

2012-11-28 18:05:09 +01:00

vf_hue.c

lavfi: convert remaining input/output list compound literals to named objects.

2012-11-28 23:19:20 +01:00

vf_idet.c

lavfi: convert remaining input/output list compound literals to named objects.

2012-11-28 23:19:20 +01:00

vf_libopencv.c

vf_libopencv: switch to filter_frame, this filter did not support slices

2012-11-28 20:25:55 +01:00

vf_lut.c

vf_lut: switch to filter_frame

2012-11-28 22:39:35 +01:00

vf_mp.c

lavfi: convert remaining input/output list compound literals to named objects.

2012-11-28 23:19:20 +01:00

vf_null.c

vf_null: switch to filter_frame

2012-11-29 02:09:01 +01:00

vf_overlay.c

lavfi: merge start_frame/draw_slice/end_frame

2012-11-28 08:50:19 +01:00

vf_pad.c

vf_pad: switch to filter_frame

2012-11-28 21:28:02 +01:00

vf_pixdesctest.c

vf_pixdesctest: switch to filter_frame

2012-11-28 20:25:55 +01:00

vf_removelogo.c

lavfi: convert remaining input/output list compound literals to named objects.

2012-11-28 23:19:20 +01:00

vf_scale.c

vf_scale: switch to filter_frame

2012-11-29 01:20:53 +01:00

vf_select.c

vf_select: switch to filter_frame

2012-11-28 21:28:02 +01:00

vf_setfield.c

lavfi: convert remaining input/output list compound literals to named objects.

2012-11-28 23:19:20 +01:00

vf_showinfo.c

vf_showinfo: switch to filter_frame

2012-11-28 21:28:02 +01:00

vf_smartblur.c

lavfi: convert remaining input/output list compound literals to named objects.

2012-11-28 23:19:20 +01:00

vf_super2xsai.c

lavfi: convert remaining input/output list compound literals to named objects.

2012-11-28 23:19:20 +01:00

vf_swapuv.c

lavfi: convert remaining input/output list compound literals to named objects.

2012-11-28 23:19:20 +01:00

vf_thumbnail.c

lavfi/thumbnail: re-use ctx instead of inlink->dst.

2012-11-29 01:43:28 +01:00

vf_tile.c

lavfi: convert remaining input/output list compound literals to named objects.

2012-11-28 23:19:20 +01:00

vf_tinterlace.c

lavfi: convert remaining input/output list compound literals to named objects.

2012-11-28 23:19:20 +01:00

vf_transpose.c

vf_transpose: switch to filter_frame

2012-11-28 21:46:23 +01:00

vf_unsharp.c

vf_unsharp: switch to filter_frame, this filter did not support slices

2012-11-28 21:47:39 +01:00

vf_vflip.c

vflip: switch to filter_frame

2012-11-29 00:09:31 +01:00

vf_yadif.c

vf_yadif: switch to filter_frame, this filter did not support slices

2012-11-28 23:47:01 +01:00

video.c

libavfilter: default to filter_frame when neither it nor start/slice/end is set.

2012-11-29 02:08:49 +01:00

video.h

lavfi: merge start_frame/draw_slice/end_frame

2012-11-28 08:50:19 +01:00

vsink_nullsink.c

vsink_nullsink: switch to filter_frame

2012-11-28 21:49:04 +01:00

vsrc_cellauto.c

lavfi: convert remaining input/output list compound literals to named objects.

2012-11-28 23:19:20 +01:00

vsrc_life.c

lavfi: convert remaining input/output list compound literals to named objects.

2012-11-28 23:19:20 +01:00

vsrc_mandelbrot.c

lavfi: add priv_class for some forgotten filters.

2012-11-29 00:50:37 +01:00

vsrc_mptestsrc.c

lavfi: add priv_class for some forgotten filters.

2012-11-29 00:50:37 +01:00

vsrc_testsrc.c

lavfi: convert remaining input/output list compound literals to named objects.

2012-11-28 23:19:20 +01:00

yadif.h

Merge remote-tracking branch 'qatar/master'

2012-10-06 13:45:08 +02:00