Michael Niedermayer ac8987591f Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f' ...

* commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f':
  Drop DCTELEM typedef

Conflicts:
	libavcodec/alpha/dsputil_alpha.h
	libavcodec/alpha/motion_est_alpha.c
	libavcodec/arm/dsputil_init_armv6.c
	libavcodec/bfin/dsputil_bfin.h
	libavcodec/bfin/pixels_bfin.S
	libavcodec/cavs.c
	libavcodec/cavsdec.c
	libavcodec/dct-test.c
	libavcodec/dnxhdenc.c
	libavcodec/dsputil.c
	libavcodec/dsputil.h
	libavcodec/dsputil_template.c
	libavcodec/eamad.c
	libavcodec/h264_cavlc.c
	libavcodec/h264idct_template.c
	libavcodec/mpeg12.c
	libavcodec/mpegvideo.c
	libavcodec/mpegvideo.h
	libavcodec/mpegvideo_enc.c
	libavcodec/ppc/dsputil_altivec.c
	libavcodec/proresdsp.c

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

2013-01-23 17:44:56 +01:00

..

libmpcodecs

Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'

2013-01-23 17:44:56 +01:00

x86

Merge commit 'a1c525f7eb0783d31ba7a653865b6cbd3dc880de'

2013-01-14 14:43:32 +01:00

af_aconvert.c

lavfi/af_aconvert: update audio->channels.

2012-12-20 17:01:35 +01:00

af_afade.c

afade filter

2013-01-21 15:20:42 +00: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_apad.c

af_apad: remove unneeded av_opt_free

2012-12-18 17:31:01 +01:00

af_aresample.c

lavfi/aresample: fix style

2012-12-26 11:56:35 +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

Merge commit '07acdd651d1e2f4cfa5f610e616e70e323bb69cd'

2012-12-14 15:56:56 +01:00

af_atempo.c

lavfi: declare arrays that never change as static const

2012-12-21 22:38:59 +00: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: declare arrays that never change as static const

2012-12-21 22:38:59 +00:00

af_join.c

lavfi: replace filter_samples by filter_frame

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

af_pan.c

lavfi: add a channels field to AVFilterLink.

2012-12-20 13:03:41 +01:00

af_resample.c

lavfi: replace filter_samples by filter_frame

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

af_silencedetect.c

lavfi: declare arrays that never change as static const

2012-12-21 22:38:59 +00:00

af_volume.c

lavfi: drop af_volume_stefano.c in favor of af_volume_justin.c

2012-12-08 15:40:07 +01:00

af_volume.h

Merge commit 'b519298a1578e0c895d53d4b4ed8867b1c031a56'

2012-12-06 15:55:47 +01:00

af_volumedetect.c

lavfi: declare arrays that never change as static const

2012-12-21 22:38:59 +00: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

afade filter

2013-01-21 15:20:42 +00: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/aevalsrc: try to honor specified duration

2013-01-12 17:26:35 +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

lavfi: merge all filtering code into ff_filter_frame.

2013-01-01 15:19:04 +01:00

audio.h

libavfilter: Support using filter_frame for video

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

avcodec.c

lavfi/avcodec: fix typo

2013-01-01 12:57:07 +00:00

avcodec.h

lavfi: add avfilter_get_buffer_ref_from_frame.

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

avf_concat.c

avf_concat: init pointers to NULL for saftey and to avoid warning of uninitialized use.

2012-12-29 18:56:33 +01:00

avf_showspectrum.c

lavfi/show{spectrum,waves}: use ff_filter_frame().

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

avf_showwaves.c

lavfi/showwaves: fix check on showwaves->outpicref

2013-01-22 20:34:29 +01:00

avfilter.c

lavfi: fix null checking in avfilter_config_links()

2013-01-21 00:07:00 +01:00

avfilter.h

lavfi/avfilter: remove now unused {src,cur,out}_buf.

2013-01-06 04:14:56 +01:00

avfiltergraph.c

Replace references to "que" with the appropriate word.

2013-01-03 00:21:47 +01:00

avfiltergraph.h

avfiltergraph: add aresample_swr_opts

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

bbox.c

bbox: remove superfluous initializations

2012-03-22 13:40:37 +01:00

bbox.h

lavfi: add bbox filter

2012-03-17 11:21:49 +01:00

buffer.c

ff_copy_buffer_ref: use the channel count

2012-12-12 14:12:47 +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

lavfi/buffersrc: remove init of rate and layout.

2012-12-20 13:03:42 +01:00

buffersrc.h

Merge commit '23aae62c2cb4504a09ceb8cd0cabc1c8b260f521'

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

drawutils.c

lavfi/drawutils: fix blending computation in blend_line function

2013-01-05 13:08:02 +01:00

drawutils.h

lavfi/drawutils: fix typo

2013-01-05 05:21:44 +01:00

f_ebur128.c

lavfi: EBU R.128 irregular time

2013-01-19 03:13:24 +01:00

f_select.c

lavfi/select: fix compilation with avcodec disabled.

2012-12-20 05:17:36 +01:00

f_sendcmd.c

lavfi/sendcmd: switch to filter_frame API

2012-12-08 12:10:40 +01:00

f_setpts.c

lavfi/setpts: enable debug logs, and improve/extend debug messages

2012-12-19 11:49:54 +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

Merge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967'

2012-12-05 13:34:45 +01: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

lavfi/gradfun: support named options.

2012-12-19 03:13:26 +01: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

internal.h: remove start/end_frame from AVFilterPad

2013-01-05 23:36:09 +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

afade filter

2013-01-21 15:20:42 +00:00

sink_buffer.c

lavfi/sink_buffer: switch to filter_frame.

2012-12-30 18:29:57 +01:00

split.c

libavfilter/split: switch to filter_frame

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

src_buffer.c

lavfi: add avfilter_get_audio_buffer_ref_from_arrays_channels.

2013-01-01 02:01:28 +01: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

afade filter

2013-01-21 15:20:42 +00:00

vf_alphaextract.c

lavfi: declare arrays that never change as static const

2012-12-21 22:38:59 +00:00

vf_alphamerge.c

lavfi: declare arrays that never change as static const

2012-12-21 22:38:59 +00:00

vf_aspect.c

vf_aspect: switch to filter_frame

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

vf_ass.c

lavfi/subtitles: 10l close codec before format.

2012-12-04 23:56:02 +01:00

vf_bbox.c

lavfi/bbox: switch to ff_filter_frame() API

2012-12-02 18:13:49 +01:00

vf_blackdetect.c

lavfi/blackdetect: switch to new ff_filter_frame() API

2012-12-02 12:42:29 +01:00

vf_blackframe.c

vf_blackframe: switch to filter_frame

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

vf_boxblur.c

lavfi: declare arrays that never change as static const

2012-12-21 22:38:59 +00: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

lavfi/crop: free x and y parsed expression objects

2012-12-16 13:16:47 +01:00

vf_cropdetect.c

vf_cropdetect: switch to filter_frame

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

vf_decimate.c

Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'

2013-01-23 17:44:56 +01:00

vf_delogo.c

lavfi: declare arrays that never change as static const

2012-12-21 22:38:59 +00:00

vf_deshake.c

vf_deshake: fix strict aliassing errors

2012-12-29 20:00:48 +01:00

vf_drawbox.c

lavfi: declare arrays that never change as static const

2012-12-21 22:38:59 +00:00

vf_drawtext.c

lavfi/drawtext: make use of outlink variable in filter_frame()

2012-12-06 13:51:27 +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: use AVPixFmtDescriptor to find out if pixel format have alpha

2013-01-18 22:51:05 +00:00

vf_field.c

lavfi/field: switch to filter_frame API

2012-12-06 13:51:34 +01:00

vf_fieldorder.c

Merge remote-tracking branch 'qatar/master'

2012-11-29 02:54:50 +01:00

vf_format.c

vf_format: switch to filter_frame

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

vf_fps.c

Merge commit 'dae1d507af94261bafd3b11549884e5d1eca590e'

2013-01-16 11:44:45 +01:00

vf_framestep.c

lavfi/framestep: switch to ff_filter_frame API

2012-12-02 15:02:05 +01:00

vf_frei0r.c

Merge remote-tracking branch 'qatar/master'

2012-12-31 14:20:01 +01:00

vf_geq.c

lavfi/geq: add T variable and example

2012-12-01 16:05:15 +01:00

vf_gradfun.c

lavfi/gradfun: support YUV440P

2013-01-13 13:23:30 +00:00

vf_hflip.c

vf_hflip: switch to filter_frame

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

vf_histeq.c

lavfi: add histeq filter

2013-01-05 10:25:32 +01:00

vf_hqdn3d.c

Merge remote-tracking branch 'qatar/master'

2012-12-31 14:20:01 +01:00

vf_hue.c

lavfi/hue: move to ff_filter_frame.

2012-12-02 14:44:31 +01:00

vf_idet.c

vf_idet: fix type of stats

2012-12-26 17:27:28 +01:00

vf_kerndeint.c

lavfi/kerndeint: remove unused pixel_step.

2013-01-06 18:59:15 +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

lavfi/lut: use ff_fill_rgba_map()

2013-01-01 17:07:57 +00:00

vf_mp.c

vf_mp: fix 'discards const qualifier from pointer target type'

2012-12-28 17:00:01 +01:00

vf_null.c

vf_null: switch to filter_frame

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

vf_overlay.c

lavfi/vf_overlay: check that filter_frame does not return EAGAIN.

2013-01-10 21:55:02 +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_pp.c

lavfi: add pp filter.

2012-12-23 19:03:36 +01:00

vf_removelogo.c

lavfi: declare arrays that never change as static const

2012-12-21 22:38:59 +00:00

vf_scale.c

lavfi/scale: remove usage of link->cur_buf.

2012-12-26 21:30:45 +01:00

vf_setfield.c

lavfi/setfield: add support to named options and introspection

2012-12-08 18:26:32 +01:00

vf_showinfo.c

lavfi/showinfo: check plane count before dereferencing.

2012-12-12 02:55:10 +01:00

vf_smartblur.c

lavfi/smartblur: switch to filter_frame.

2012-11-29 12:49:03 +01:00

vf_super2xsai.c

lavfi/vf_super2xsai: fix output ref size.

2012-12-02 17:08:17 +01:00

vf_swapuv.c

lavfi/swapuv: support all planar yuv pixel formats

2013-01-23 16:13:23 +00: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/tile: small align cosmetics.

2012-12-26 21:32:38 +01:00

vf_tinterlace.c

vf_tinterlace: fix logical/bit op mixup

2013-01-06 04:38:53 +01:00

vf_transpose.c

lavfi: declare arrays that never change as static const

2012-12-21 22:38:59 +00:00

vf_unsharp.c

lavfi: declare arrays that never change as static const

2012-12-21 22:38:59 +00:00

vf_vflip.c

vflip: switch to filter_frame

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

vf_yadif.c

lavfi/yadif: fix shorthand/option mismatch

2013-01-10 11:01:14 +01:00

video.c

lavfi: merge all filtering code into ff_filter_frame.

2013-01-01 15:19:04 +01:00

video.h

libavfilter/video.h: remove unused things related to the start/slice/end API

2013-01-05 23:36:09 +01:00

vsink_nullsink.c

vsink_nullsink: switch to filter_frame

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

vsrc_cellauto.c

lavfi/vsrc: switch to ff_filter_frame.

2012-12-02 00:23:45 +01:00

vsrc_life.c

lavfi/vsrc: switch to ff_filter_frame.

2012-12-02 00:23:45 +01:00

vsrc_mandelbrot.c

vsrc_mandelbrot: switch to filter_frame

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

vsrc_mptestsrc.c

lavfi/vsrc: switch to ff_filter_frame.

2012-12-02 00:23:45 +01:00

vsrc_testsrc.c

vsrc_testsrc: Fix assignments in if()

2013-01-14 05:05:40 +01:00

yadif.h

lavfi/yadif: add support to named constants

2013-01-04 11:48:54 +01:00