Michael Niedermayer 494945cb66 Merge commit 'd1d9efaae6c7e8466b06c30ca21c6b569dd2e480' ...

* commit 'd1d9efaae6c7e8466b06c30ca21c6b569dd2e480':
  avcodec: split avpicture from imgconvert
  pixdesc: add PIX_FMT_ALPHA flag

Conflicts:
	libavcodec/imgconvert.c

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

2012-11-21 15:37:01 +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

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

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

af_aformat.c

Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88'

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

af_amerge.c

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

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

af_amix.c

Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88'

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

af_anull.c

Merge commit '4436f25a1682ada3f7226cb6fadf429946933161'

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

af_aresample.c

af_aresample: allocate at least 1 sample buffer. Fix null ptr dereference.

2012-11-19 15:55:54 +01:00

af_asetnsamples.c

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

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

af_ashowinfo.c

lavfi: store and propagate number of channels information in audio buffer properties

2012-11-13 12:15:27 +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

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

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

af_channelmap.c

Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88'

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

af_channelsplit.c

Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88'

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

af_earwax.c

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

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

af_join.c

Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88'

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

af_pan.c

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

2012-11-13 13:21:21 +00: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

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

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

af_volume.c

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

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

af_volumedetect.c

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

2012-11-13 13:21:21 +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

lavfi: add geq filter.

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

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

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

asrc_anullsrc.c

Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88'

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

asrc_flite.c

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

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

audio.c

Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88'

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

audio.h

Merge remote-tracking branch 'qatar/master'

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

avcodec.c

liavfi/avcodec: allow channel layouts with fewer channels than actually available.

2012-11-18 22:54:18 +01:00

avcodec.h

lavfi: add avfilter_get_buffer_ref_from_frame.

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

avf_concat.c

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

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

avf_showspectrum.c

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

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

avf_showwaves.c

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

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

avfilter.c

Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88'

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

avfilter.h

lavfi: store and propagate number of channels information in audio buffer properties

2012-11-13 12:15:27 +01:00

avfiltergraph.c

Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88'

2012-11-12 11:32:11 +01: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

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

Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88'

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

buffersink.h

Merge commit '716d413c13981da15323c7a3821860536eefdbbb'

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

buffersrc.c

Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88'

2012-11-12 11:32:11 +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

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

2012-11-13 13:21:21 +00: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 '97bf7c03b1338a867da52c159a2afecbdedcfa88'

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

filtfmts.c

lavfi: do not use av_pix_fmt_descriptors directly.

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

formats.c

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

2012-11-13 13:21:21 +00: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

lavfi: fix references to avfilter_* functions that don't exist anymore.

2012-10-31 20:54:59 +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

lavfi: remove mp=geq filter.

2012-11-11 23:18:12 +01:00

sink_buffer.c

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

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

split.c

Merge commit '4436f25a1682ada3f7226cb6fadf429946933161'

2012-10-11 15:46:48 +02: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/movie: return proper error code in case of av_get_token() allocation failure

2012-11-06 23:31:16 +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: implement more generic expansion.

2012-11-18 15:55:47 +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

vf_drawbox: dont move uninitialized and then unused colors around

2012-11-06 21:40:23 +01:00

vf_drawtext.c

lavfi/drawtext: implement more generic expansion.

2012-11-18 15:55:47 +01: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: in init() check path loop, free resources in a single point

2012-11-18 16:52:46 +01:00

vf_geq.c

lavfi/geq: fix GPL license header.

2012-11-15 21:48:39 +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: remove mp=geq filter.

2012-11-11 23:18:12 +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: declare the filter private class

2012-11-04 18:01:16 +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

lavfi/tile: extend shorthand parameters.

2012-11-11 22:43:18 +01:00

vf_tinterlace.c

vf_tinterlace: check av_image_get_linesize() return value

2012-11-03 02:38:30 +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