Michael Niedermayer 0cfbfaaa12 Merge commit '7b89cd20d844cbe763ca34e63e99d110043cf241' ...

* commit '7b89cd20d844cbe763ca34e63e99d110043cf241':
  eamad: allocate a dummy reference frame when the real one is missing
  Replace remaining includes of audioconvert.h with channel_layout.h
  Replace some forgotten instances of PIX_FMT_* with AV_PIX_FMT_*.

Conflicts:
	libavcodec/h264.c

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

2013-03-12 15:44:15 +01:00

..

libmpcodecs

lavfi/mp: drop mp=stereo3d filter

2013-03-05 18:45:35 +00:00

x86

Merge commit '64ed397635ef2666b0ca0c8d8c60a8bc44581d82'

2013-02-16 09:09:38 +01:00

af_aconvert.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

af_afade.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

af_aformat.c

…

af_amerge.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

af_amix.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

af_anull.c

…

af_apad.c

lavfi: remove remaining forgotten min/rej perms.

2013-03-10 02:38:21 +01:00

af_aresample.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

af_asetnsamples.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

af_ashowinfo.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

af_astreamsync.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

af_asyncts.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

af_atempo.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

af_biquads.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

af_channelmap.c

lavfi: remove remaining forgotten min/rej perms.

2013-03-10 02:38:21 +01:00

af_channelsplit.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

af_earwax.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

af_join.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

af_pan.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

af_resample.c

lavfi: switch to AVFrame.

2013-03-08 07:37:18 +01:00

af_silencedetect.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

af_volume.c

Merge commit '7b89cd20d844cbe763ca34e63e99d110043cf241'

2013-03-12 15:44:15 +01:00

af_volume.h

…

af_volumedetect.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

all_channel_layouts.inc

…

allfilters.c

lavfi: add curves filter.

2013-03-10 03:00:10 +01:00

asink_anullsink.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

asrc_abuffer.h

…

asrc_aevalsrc.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

asrc_anullsrc.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

asrc_flite.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

audio.c

avfilter: avoid direct access to "frame"->channels

2013-03-10 11:25:54 +01:00

audio.h

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

avcodec.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

avcodec.h

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

avf_concat.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

avf_showspectrum.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

avf_showwaves.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

avfilter.c

avfilter: avoid direct access to "frame"->channels

2013-03-10 11:25:54 +01:00

avfilter.h

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

avfiltergraph.c

Use the avstring.h locale-independent character type functions

2013-03-07 15:16:36 +02:00

avfiltergraph.h

avfilter/avfiltergraph.h: Move public field out of the private fields

2013-02-24 20:31:56 +01:00

bbox.c

…

bbox.h

…

buffer.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

bufferqueue.h

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

buffersink.c

lavfi/buffersink: move the filter structures at the end.

2013-03-11 19:00:49 +01:00

buffersink.h

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

buffersrc.c

lavfi/buffersrc: do not dereference NULL frame.

2013-03-10 17:05:55 +01:00

buffersrc.h

lavfi/buffersrc: implement flags.

2013-03-10 13:56:17 +01:00

drawutils.c

…

drawutils.h

…

f_ebur128.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

f_select.c

lavfi: remove remaining forgotten min/rej perms.

2013-03-10 02:38:21 +01:00

f_sendcmd.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

f_setpts.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

f_settb.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

fifo.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

filtfmts.c

…

formats.c

lavfi/formats: reindent after last commit.

2013-02-24 12:05:06 +01:00

formats.h

lavfi: fix merging of formats and clarify exception.

2013-02-24 11:58:52 +01:00

gradfun.h

…

graphdump.c

…

graphparser.c

Use the avstring.h locale-independent character type functions

2013-03-07 15:16:36 +02:00

internal.h

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

lavfutils.c

…

lavfutils.h

…

libavfilter.v

…

lswsutils.c

…

lswsutils.h

…

Makefile

lavfi: rename sink_buffer.c into buffersink.c.

2013-03-10 17:05:55 +01:00

split.c

lavfi: remove remaining forgotten min/rej perms.

2013-03-10 02:38:21 +01:00

src_movie.c

lavfi/moviesrc: use refcounted frames

2013-03-12 03:23:57 +01:00

transform.c

…

transform.h

…

version.h

Merge commit 'd8b31be6caebd8d1321ecb754b6e7daaf81dc111'

2013-03-12 15:35:39 +01:00

vf_alphaextract.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

vf_alphamerge.c

lavfi: remove remaining forgotten min/rej perms.

2013-03-10 02:38:21 +01:00

vf_aspect.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

vf_bbox.c

lavfi: remove remaining forgotten min/rej perms.

2013-03-10 02:38:21 +01:00

vf_blackdetect.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

vf_blackframe.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

vf_blend.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

vf_boxblur.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

vf_colormatrix.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

vf_copy.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

vf_crop.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

vf_cropdetect.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

vf_curves.c

lavfi: add curves filter.

2013-03-10 03:00:10 +01:00

vf_decimate.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

vf_delogo.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

vf_deshake.c

lavfi: remove remaining forgotten min/rej perms.

2013-03-10 02:38:21 +01:00

vf_drawbox.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

vf_drawtext.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

vf_edgedetect.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

vf_fade.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

vf_field.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

vf_fieldorder.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

vf_format.c

…

vf_fps.c

lavfi: remove remaining forgotten min/rej perms.

2013-03-10 02:38:21 +01:00

vf_framestep.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

vf_frei0r.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

vf_geq.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

vf_gradfun.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

vf_hflip.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

vf_histeq.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

vf_histogram.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

vf_hqdn3d.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

vf_hqdn3d.h

…

vf_hue.c

lavfi/hue: reindent.

2013-03-10 02:13:02 +01:00

vf_idet.c

lavfi: remove remaining forgotten min/rej perms.

2013-03-10 02:38:21 +01:00

vf_il.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

vf_kerndeint.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

vf_libopencv.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

vf_lut.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

vf_mp.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

vf_noise.c

lavfi: remove remaining forgotten min/rej perms.

2013-03-10 02:38:21 +01:00

vf_null.c

…

vf_overlay.c

lavfi: remove remaining forgotten min/rej perms.

2013-03-10 02:38:21 +01:00

vf_pad.c

lavfi/pad: avoid buffer overflow in buffer_needs_copy()

2013-03-10 10:38:42 +01:00

vf_pixdesctest.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

vf_pp.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

vf_removelogo.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

vf_scale.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

vf_setfield.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

vf_showinfo.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

vf_smartblur.c

lavfi/smartblur: add support to named options

2013-03-10 16:38:45 +01:00

vf_stereo3d.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

vf_subtitles.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

vf_super2xsai.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

vf_swapuv.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

vf_thumbnail.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

vf_tile.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

vf_tinterlace.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

vf_transpose.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

vf_unsharp.c

lavfi/unsharp: add missing option flags

2013-03-10 13:22:58 +01:00

vf_vflip.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

vf_yadif.c

lavfi: remove remaining forgotten min/rej perms.

2013-03-10 02:38:21 +01:00

video.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

video.h

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

vsink_nullsink.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

vsrc_cellauto.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

vsrc_life.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

vsrc_mandelbrot.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

vsrc_mptestsrc.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

vsrc_testsrc.c

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00

yadif.h

Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

2013-03-10 01:40:35 +01:00