Michael Niedermayer 9766d9c985 Merge commit '04581c8c77ce779e4e70684ac45302972766be0f' ...

* commit '04581c8c77ce779e4e70684ac45302972766be0f':
  x86: yasm: Use complete source path for macro helper %includes

Conflicts:
	Makefile

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

2012-10-31 13:57:09 +01:00

..

libmpcodecs

lavfi/mp: drop wrapped field filter

2012-10-31 12:14:09 +01:00

x86

Merge commit '04581c8c77ce779e4e70684ac45302972766be0f'

2012-10-31 13:57:09 +01:00

af_aconvert.c

lavfi: decrease logging level of message showing initial parameters

2012-07-15 15:07:03 +02:00

af_aformat.c

Merge commit '4436f25a1682ada3f7226cb6fadf429946933161'

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

af_amerge.c

lavfi/amerge: clarify the error message in case of input overlap

2012-09-11 18:58:19 +02:00

af_amix.c

Merge commit '4436f25a1682ada3f7226cb6fadf429946933161'

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

af_anull.c

Merge commit '4436f25a1682ada3f7226cb6fadf429946933161'

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

af_aresample.c

af_aresample: fix leak on alloc failure

2012-10-11 16:48:25 +02:00

af_asetnsamples.c

Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'

2012-09-05 14:33:32 +02:00

af_ashowinfo.c

af_ashowinfo: integrate config_input() in filter_samples.

2012-10-30 19:26:07 +01:00

af_astreamsync.c

af_channelmap: require AV_PERM_PRESERVE.

2012-08-17 18:26:39 +02:00

af_asyncts.c

Merge commit '4436f25a1682ada3f7226cb6fadf429946933161'

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

af_atempo.c

lavfi/af_atempo: use av_malloc for rDFT buffers.

2012-08-29 18:19:41 +02:00

af_channelmap.c

Merge commit '4521645b1aee9e9ad8f5cea7b2392cd5f6ffcd26'

2012-10-28 13:19:11 +01:00

af_channelsplit.c

Merge commit '4436f25a1682ada3f7226cb6fadf429946933161'

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

af_earwax.c

Merge remote-tracking branch 'qatar/master'

2012-07-09 22:40:12 +02:00

af_join.c

Merge commit '4436f25a1682ada3f7226cb6fadf429946933161'

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

af_pan.c

af_pan: fix memleak of arg

2012-10-13 01:51:45 +02:00

af_resample.c

lavfi: convert input/ouput list compound literals to named objects

2012-10-10 22:26:12 +01:00

af_silencedetect.c

lavfi/silencedetect: export silence info to metadata.

2012-10-21 17:29:11 +02:00

af_volume.c

lavfi: decrease logging level of message showing initial parameters

2012-07-15 15:07:03 +02:00

af_volumedetect.c

lavfi/af_volumedetect: print stats in uninit().

2012-10-25 20:16:09 +02: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

lavfi: add field filter

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

asink_anullsink.c

Merge commit '4436f25a1682ada3f7226cb6fadf429946933161'

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

asrc_abuffer.h

asrc_abuffer: deprecate the header.

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

asrc_aevalsrc.c

asrc_aevalsrc: Fix use of uninitialized pointer inside av_strtok()

2012-10-11 03:00:34 +02:00

asrc_anullsrc.c

Merge commit '4436f25a1682ada3f7226cb6fadf429946933161'

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

asrc_flite.c

Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'

2012-09-05 14:33:32 +02:00

audio.c

lavfi: check that buffer and link properties match.

2012-09-13 20:09:53 +02:00

audio.h

Merge remote-tracking branch 'qatar/master'

2012-07-09 22:40:12 +02:00

avcodec.c

lavc: add lavfi metadata support.

2012-10-21 17:29:10 +02:00

avcodec.h

lavfi: add avfilter_get_buffer_ref_from_frame.

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

avf_concat.c

lavfi/concat: implement unsafe mode.

2012-10-28 09:14:34 +01:00

avf_showspectrum.c

lavf/showspectrum: fix unaligned rdft data.

2012-10-27 22:59:05 +02:00

avf_showwaves.c

Merge commit '716d413c13981da15323c7a3821860536eefdbbb'

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

avfilter.c

Merge commit '59ee9f78b0cc4fb84ae606fa317d8102ad32a627'

2012-10-12 17:04:58 +02:00

avfilter.h

libavfilter: include needed header for AVDictionary

2012-10-24 22:24:54 +02:00

avfiltergraph.c

lavfi/avfiltergraph: avoid to print "(null)" in the scale args

2012-10-21 21:44:53 +02:00

avfiltergraph.h

lavfi/avfiltergraph: apply misc fixes to fix avfilter_graph_request_oldest() @return doxy

2012-07-18 17:13:00 +02: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

lavc: add lavfi metadata support.

2012-10-21 17:29:10 +02:00

bufferqueue.h

lavfi: add a generic API for buffer queues.

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

buffersink.c

buffersink: remove stray semicolon after function definition

2012-10-27 13:06:27 +01:00

buffersink.h

Merge commit '716d413c13981da15323c7a3821860536eefdbbb'

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

buffersrc.c

libavfilter/buffersrc: Do not fail hard on changes of input parameters.

2012-10-17 00:06:12 +02:00

buffersrc.h

Merge commit '23aae62c2cb4504a09ceb8cd0cabc1c8b260f521'

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

drawutils.c

Merge commit '59ee9f78b0cc4fb84ae606fa317d8102ad32a627'

2012-10-12 17:04:58 +02:00

drawutils.h

Merge commit '716d413c13981da15323c7a3821860536eefdbbb'

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

f_ebur128.c

lavfi/ebur128: fix typo in condition.

2012-10-11 18:41:07 +02:00

f_sendcmd.c

lavfi/sendcmd: move buf init() variable to internal scope where it is used

2012-10-23 22:08:55 +02:00

f_setpts.c

Merge commit '4436f25a1682ada3f7226cb6fadf429946933161'

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

f_settb.c

Merge commit '4436f25a1682ada3f7226cb6fadf429946933161'

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

fifo.c

Merge commit '4436f25a1682ada3f7226cb6fadf429946933161'

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

filtfmts.c

lavfi: do not use av_pix_fmt_descriptors directly.

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

formats.c

Merge commit '59ee9f78b0cc4fb84ae606fa317d8102ad32a627'

2012-10-12 17:04:58 +02: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

lavfi: remove unnecessary inclusion of libavcodec/avcodec.h in avfilter.h

2012-06-25 13:42:37 +02:00

graphparser.c

Merge commit '1b891d17c531e8a63c2974aab4bf997ce70746f3'

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

internal.h

Merge commit '716d413c13981da15323c7a3821860536eefdbbb'

2012-10-08 21:06:57 +02: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

lavfi/mp: drop wrapped field filter

2012-10-31 12:14:09 +01:00

sink_buffer.c

Merge commit '716d413c13981da15323c7a3821860536eefdbbb'

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

split.c

Merge commit '4436f25a1682ada3f7226cb6fadf429946933161'

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

src_buffer.c

Merge commit '716d413c13981da15323c7a3821860536eefdbbb'

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

src_movie.c

Merge commit '7751e4693dd10ec98c20fbd9887233b575034272'

2012-09-25 15:15:16 +02:00

transform.c

libavfilter/transform: fix mirroring.

2012-06-20 23:55:17 +02:00

transform.h

lavfi/transform: fix make checkheaders.

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

version.h

lavfi/drawbox: implement color=invert mode

2012-10-31 12:14:21 +01:00

vf_alphaextract.c

Merge commit '716d413c13981da15323c7a3821860536eefdbbb'

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

vf_alphamerge.c

Merge commit '716d413c13981da15323c7a3821860536eefdbbb'

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

vf_aspect.c

vf_aspect: unbreak avoption system

2012-10-22 13:12:15 +02:00

vf_ass.c

lavfi/ass: extend syntax for ass filter

2012-10-15 22:40:08 +02:00

vf_bbox.c

Merge commit '716d413c13981da15323c7a3821860536eefdbbb'

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

vf_blackdetect.c

Merge commit '716d413c13981da15323c7a3821860536eefdbbb'

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

vf_blackframe.c

Merge commit '4436f25a1682ada3f7226cb6fadf429946933161'

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

vf_boxblur.c

Merge commit '59ee9f78b0cc4fb84ae606fa317d8102ad32a627'

2012-10-12 17:04:58 +02:00

vf_colormatrix.c

Replace usage of the deprecated av_pix_fmt_descriptors array with av_pix_fmt_desc_get

2012-10-20 18:00:13 +02:00

vf_copy.c

Merge commit '4436f25a1682ada3f7226cb6fadf429946933161'

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

vf_crop.c

Merge commit '59ee9f78b0cc4fb84ae606fa317d8102ad32a627'

2012-10-12 17:04:58 +02:00

vf_cropdetect.c

Merge commit '59ee9f78b0cc4fb84ae606fa317d8102ad32a627'

2012-10-12 17:04:58 +02:00

vf_decimate.c

Replace usage of the deprecated av_pix_fmt_descriptors array with av_pix_fmt_desc_get

2012-10-20 18:00:13 +02:00

vf_delogo.c

Merge commit '59ee9f78b0cc4fb84ae606fa317d8102ad32a627'

2012-10-12 17:04:58 +02:00

vf_deshake.c

Replace usage of the deprecated av_pix_fmt_descriptors array with av_pix_fmt_desc_get

2012-10-20 18:00:13 +02:00

vf_drawbox.c

lavfi/drawbox: remove some unnecessary parentheses

2012-10-31 12:20:50 +01:00

vf_drawtext.c

lavfi: do not use av_pix_fmt_descriptors directly.

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

vf_edgedetect.c

Merge commit '716d413c13981da15323c7a3821860536eefdbbb'

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

vf_fade.c

vf_fade: fix memleaks of args

2012-10-13 01:08:08 +02:00

vf_field.c

lavfi: add field filter

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

vf_fieldorder.c

Merge commit '59ee9f78b0cc4fb84ae606fa317d8102ad32a627'

2012-10-12 17:04:58 +02:00

vf_format.c

Merge commit '4436f25a1682ada3f7226cb6fadf429946933161'

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

vf_fps.c

lavfi/vf_fps: allow to set the rounding method.

2012-10-25 19:42:44 +02:00

vf_framestep.c

vf_framestep: fix uninitilaized variable bug

2012-08-30 05:09:15 +02:00

vf_frei0r.c

lavfi/frei0r: allow for Windows style paths

2012-10-29 18:50:48 +01:00

vf_gradfun.c

Merge commit 'f6c38c5f4ed6683a6a61db2ed418a68bbe5f5507'

2012-10-13 14:14:11 +02:00

vf_hflip.c

Replace usage of the deprecated av_pix_fmt_descriptors array with av_pix_fmt_desc_get

2012-10-20 18:00:13 +02:00

vf_hqdn3d.c

Merge commit '59ee9f78b0cc4fb84ae606fa317d8102ad32a627'

2012-10-12 17:04:58 +02:00

vf_hue.c

Replace usage of the deprecated av_pix_fmt_descriptors array with av_pix_fmt_desc_get

2012-10-20 18:00:13 +02:00

vf_idet.c

Replace usage of the deprecated av_pix_fmt_descriptors array with av_pix_fmt_desc_get

2012-10-20 18:00:13 +02:00

vf_libopencv.c

Merge commit '4436f25a1682ada3f7226cb6fadf429946933161'

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

vf_lut.c

Merge commit '59ee9f78b0cc4fb84ae606fa317d8102ad32a627'

2012-10-12 17:04:58 +02:00

vf_mp.c

lavfi/mp: drop wrapped field filter

2012-10-31 12:14:09 +01:00

vf_null.c

Merge commit '4436f25a1682ada3f7226cb6fadf429946933161'

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

vf_overlay.c

Replace usage of the deprecated av_pix_fmt_descriptors array with av_pix_fmt_desc_get

2012-10-20 18:00:13 +02:00

vf_pad.c

lavfi: do not use av_pix_fmt_descriptors directly.

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

vf_pixdesctest.c

Merge commit '59ee9f78b0cc4fb84ae606fa317d8102ad32a627'

2012-10-12 17:04:58 +02:00

vf_removelogo.c

Merge commit '716d413c13981da15323c7a3821860536eefdbbb'

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

vf_scale.c

lavfi/scale: implement clever/insane parsing heuristic, and add a size option

2012-10-29 17:44:53 +01:00

vf_select.c

lavfi/select: store scene score in buf ref metadata.

2012-10-21 17:29:11 +02:00

vf_setfield.c

Merge remote-tracking branch 'qatar/master'

2012-07-22 23:56:21 +02:00

vf_showinfo.c

vf_showinfo: check return code of av_image_get_linesize()

2012-10-28 00:40:28 +02:00

vf_slicify.c

Merge commit '59ee9f78b0cc4fb84ae606fa317d8102ad32a627'

2012-10-12 17:04:58 +02:00

vf_smartblur.c

lavfi/smartblur: add missing draw slice call.

2012-10-30 19:37:20 +01:00

vf_super2xsai.c

Merge commit '716d413c13981da15323c7a3821860536eefdbbb'

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

vf_swapuv.c

Merge commit '716d413c13981da15323c7a3821860536eefdbbb'

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

vf_thumbnail.c

Merge commit '716d413c13981da15323c7a3821860536eefdbbb'

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

vf_tile.c

vf_tile: fix output buffer ownership.

2012-08-01 12:23:48 +02:00

vf_tinterlace.c

lavfi/tinterlace: remove poll_frame() callback

2012-10-30 23:32:20 +01:00

vf_transpose.c

Merge commit '59ee9f78b0cc4fb84ae606fa317d8102ad32a627'

2012-10-12 17:04:58 +02:00

vf_unsharp.c

Merge commit '59ee9f78b0cc4fb84ae606fa317d8102ad32a627'

2012-10-12 17:04:58 +02:00

vf_vflip.c

Merge commit '59ee9f78b0cc4fb84ae606fa317d8102ad32a627'

2012-10-12 17:04:58 +02:00

vf_yadif.c

Merge commit 'f6c38c5f4ed6683a6a61db2ed418a68bbe5f5507'

2012-10-13 14:14:11 +02:00

video.c

Replace usage of the deprecated av_pix_fmt_descriptors array with av_pix_fmt_desc_get

2012-10-20 18:00:13 +02:00

video.h

Merge commit 'fe1c1198e670242f3cf9e3e1eef27cff77f3ee23'

2012-07-29 23:04:49 +02:00

vsink_nullsink.c

Merge commit '4436f25a1682ada3f7226cb6fadf429946933161'

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

vsrc_cellauto.c

Merge commit '716d413c13981da15323c7a3821860536eefdbbb'

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

vsrc_life.c

Merge commit '716d413c13981da15323c7a3821860536eefdbbb'

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

vsrc_mandelbrot.c

mandelbrot: fix inner=period coloring routine

2012-10-16 04:00:55 +02:00

vsrc_mptestsrc.c

Replace usage of the deprecated av_pix_fmt_descriptors array with av_pix_fmt_desc_get

2012-10-20 18:00:13 +02:00

vsrc_testsrc.c

Merge commit '4436f25a1682ada3f7226cb6fadf429946933161'

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

yadif.h

Merge remote-tracking branch 'qatar/master'

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