Michael Niedermayer 91af76099e Merge commit '23aae62c2cb4504a09ceb8cd0cabc1c8b260f521' ...

* commit '23aae62c2cb4504a09ceb8cd0cabc1c8b260f521':
  alsdec: Check k used for rice decoder.
  avfiltergraph: silence an uninitialized variable warning
  xsubenc: reindent
  lavc: replace AVCodecContext.encode with subtitle-specific callback
  lavc: add const to private codec class initialization.
  avconv: don't pass a bogus parameter to avfilter_graph_create_filter().
  id3v2: strdup the genre name explicitly.
  lavf/id3v2: do not export empty fields.
  buffersrc: add const to the AVFrame* argument of av_buffersrc_write_frame()
  lavfi: replace empty input/output lists with null pointers

Conflicts:
	ffmpeg_filter.c
	libavcodec/alsdec.c
	libavcodec/dvdsubenc.c
	libavcodec/utils.c
	libavcodec/v210dec.h
	libavfilter/af_channelsplit.c
	libavfilter/avfiltergraph.c
	libavfilter/buffersrc.c
	libavfilter/src_movie.c
	libavfilter/vf_ass.c

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

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

..

libmpcodecs

lavfi/mp: drop rotate wrapper

2012-09-06 11:27:22 +02:00

x86

Merge remote-tracking branch 'qatar/master'

2012-08-31 13:34:32 +02:00

af_aconvert.c

lavfi: decrease logging level of message showing initial parameters

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

af_aformat.c

lavfi: add priv class to filter definitions and flags to filter internal options

2012-08-18 10:19:05 +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 '23aae62c2cb4504a09ceb8cd0cabc1c8b260f521'

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

af_anull.c

Merge remote-tracking branch 'qatar/master'

2012-08-16 16:20:30 +02:00

af_aresample.c

lavfi/aresample: set buffer properties after copy.

2012-09-13 12:05:19 +02:00

af_asetnsamples.c

Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'

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

af_ashowinfo.c

Merge remote-tracking branch 'qatar/master'

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

af_astreamsync.c

af_channelmap: require AV_PERM_PRESERVE.

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

af_asyncts.c

Merge remote-tracking branch 'qatar/master'

2012-09-07 13:50:24 +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

lavfi: add priv class to filter definitions and flags to filter internal options

2012-08-18 10:19:05 +02:00

af_channelsplit.c

Merge commit '23aae62c2cb4504a09ceb8cd0cabc1c8b260f521'

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

af_earwax.c

Merge remote-tracking branch 'qatar/master'

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

af_join.c

Merge commit '23aae62c2cb4504a09ceb8cd0cabc1c8b260f521'

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

af_pan.c

af_pan: Fix sscanf formats to work with buggy sscanf implementations

2012-09-15 19:49:34 -04:00

af_resample.c

Don't include common.h from avutil.h

2012-08-15 22:32:06 +03:00

af_silencedetect.c

Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'

2012-09-05 14:33:32 +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: add volumedetect filter.

2012-08-19 11:37:05 +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

libavfilter: Support the forks ABI for buffer sinks

2012-09-01 06:05:08 +02:00

asink_anullsink.c

Merge commit '23aae62c2cb4504a09ceb8cd0cabc1c8b260f521'

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

asrc_abuffer.h

asrc_abuffer: deprecate the header.

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

asrc_aevalsrc.c

Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'

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

asrc_anullsrc.c

Merge commit '23aae62c2cb4504a09ceb8cd0cabc1c8b260f521'

2012-09-18 14:45:44 +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

lavfi/avcodec: apply cosmetics style fixes

2012-09-14 11:06:40 +02:00

avcodec.h

lavfi: add avfilter_get_buffer_ref_from_frame.

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

avf_concat.c

Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'

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

avf_showspectrum.c

lavfi/showspectrum: add priv_class and flags to options

2012-08-21 01:29:25 +02:00

avf_showwaves.c

Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'

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

avfilter.c

Merge commit '23aae62c2cb4504a09ceb8cd0cabc1c8b260f521'

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

avfilter.h

lavfi: drop deprecated and pointless avfilter_default_end_frame() function

2012-09-09 10:57:28 +02:00

avfiltergraph.c

Merge commit '23aae62c2cb4504a09ceb8cd0cabc1c8b260f521'

2012-09-18 14:45:44 +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.h

…

buffer.c

lavfi: add qp_table_size

2012-09-07 13:00:47 +02:00

bufferqueue.h

lavfi: add a generic API for buffer queues.

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

buffersink.c

Merge commit '23aae62c2cb4504a09ceb8cd0cabc1c8b260f521'

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

buffersink.h

Merge remote-tracking branch 'qatar/master'

2012-08-10 16:25:23 +02:00

buffersrc.c

Merge commit '23aae62c2cb4504a09ceb8cd0cabc1c8b260f521'

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

buffersrc.h

Merge commit '23aae62c2cb4504a09ceb8cd0cabc1c8b260f521'

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

drawutils.c

Merge remote-tracking branch 'qatar/master'

2012-08-16 16:20:30 +02:00

drawutils.h

lavfi/drawutils: make ff_draw_color() accept a const rgba map

2012-08-02 12:32:48 +02:00

f_setpts.c

lavfi/setpts: set SAMPLE_RATE to NAN when input is no audio

2012-09-10 18:52:28 +02:00

f_settb.c

Merge remote-tracking branch 'qatar/master'

2012-08-16 16:20:30 +02:00

fifo.c

fifo: fix permissions.

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

filtfmts.c

Merge remote-tracking branch 'qatar/master'

2012-07-04 21:03:28 +02:00

formats.c

Merge remote-tracking branch 'qatar/master'

2012-08-16 16:20:30 +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-07-02 21:19:41 +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 remote-tracking branch 'qatar/master'

2012-08-16 16:20:30 +02:00

internal.h

Merge remote-tracking branch 'qatar/master'

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

lavfutils.c

lavfutils: fix incompatible pointer type warning

2012-05-26 20:45:59 +02:00

lavfutils.h

…

libavfilter.v

libavfilter: export ff_default_query_formats()

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

lswsutils.c

lswsutils: fix "ncompatible pointer type" warning

2012-05-26 20:46:00 +02:00

lswsutils.h

…

Makefile

lavfi/mp: drop rotate wrapper

2012-09-06 11:27:22 +02:00

sink_buffer.c

sink_buffer: fix #ifs for FF-sinks

2012-09-04 18:51:59 +02:00

split.c

Merge commit '23aae62c2cb4504a09ceb8cd0cabc1c8b260f521'

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

src_buffer.c

lavfi: remove vsrc_buffer.h API

2012-07-03 01:32:16 +02:00

src_movie.c

Merge commit '23aae62c2cb4504a09ceb8cd0cabc1c8b260f521'

2012-09-18 14:45:44 +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/hue: add dynamic expression evaluation support

2012-09-15 01:05:27 +02:00

vf_alphaextract.c

Merge remote-tracking branch 'qatar/master'

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

vf_alphamerge.c

vf_alphamerge: fix permissions.

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

vf_aspect.c

Merge remote-tracking branch 'qatar/master'

2012-08-16 16:20:30 +02:00

vf_ass.c

lavfi/ass: mark ass_libavfilter_log_level_map as static const.

2012-09-16 02:59:43 +02:00

vf_bbox.c

lavfi/video: remove duplicated function ff_null_start_frame_keep_ref()

2012-08-02 12:32:48 +02:00

vf_blackdetect.c

lavfi: add priv class to filter definitions and flags to filter internal options

2012-08-18 10:19:05 +02:00

vf_blackframe.c

Merge remote-tracking branch 'qatar/master'

2012-08-16 16:20:30 +02:00

vf_boxblur.c

lavfi: drop deprecated and pointless avfilter_default_end_frame() function

2012-09-09 10:57:28 +02:00

vf_colormatrix.c

vf_colormatrix: Drop unused strings.h header

2012-09-07 18:24:43 +02:00

vf_copy.c

Merge remote-tracking branch 'qatar/master'

2012-08-16 16:20:30 +02:00

vf_crop.c

Merge remote-tracking branch 'qatar/master'

2012-08-16 16:20:30 +02:00

vf_cropdetect.c

Merge remote-tracking branch 'qatar/master'

2012-08-16 16:20:30 +02:00

vf_decimate.c

lavfi: port decimate libmpcodecs filter

2012-08-31 16:04:37 +02:00

vf_delogo.c

Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'

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

vf_deshake.c

vf_deshake: fix permissions.

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

vf_drawbox.c

vf_drawtext: fix permissions.

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

vf_drawtext.c

Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'

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

vf_edgedetect.c

lavfi/edgedetect: use "@see" instead of the invalid "@url".

2012-08-20 23:12:34 +02:00

vf_fade.c

Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'

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

vf_fieldorder.c

vf_fieldorder: fix permissions.

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

vf_format.c

Merge remote-tracking branch 'qatar/master'

2012-08-16 16:20:30 +02:00

vf_fps.c

lavfi: add priv class to filter definitions and flags to filter internal options

2012-08-18 10:19:05 +02:00

vf_framestep.c

vf_framestep: fix uninitilaized variable bug

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

vf_frei0r.c

Merge commit '23aae62c2cb4504a09ceb8cd0cabc1c8b260f521'

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

vf_gradfun.c

Merge remote-tracking branch 'qatar/master'

2012-08-16 16:20:30 +02:00

vf_hflip.c

Merge remote-tracking branch 'qatar/master'

2012-08-16 16:20:30 +02:00

vf_hqdn3d.c

vf_hqdn3d: remove duplicate inline

2012-08-28 05:31:20 +02:00

vf_hue.c

lavfi/hue: add dynamic expression evaluation support

2012-09-15 01:05:27 +02:00

vf_idet.c

vf_idet: Remove emms

2012-09-07 20:08:12 +02:00

vf_libopencv.c

Merge remote-tracking branch 'qatar/master'

2012-08-17 17:06:52 +02:00

vf_lut.c

Rename missed cases of FF_OPT_TYPE_* to AV_OPT_TYPE_*

2012-08-31 23:27:21 +02:00

vf_mp.c

lavfi/mp: drop rotate wrapper

2012-09-06 11:27:22 +02:00

vf_null.c

Merge remote-tracking branch 'qatar/master'

2012-08-16 16:20:30 +02:00

vf_overlay.c

Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'

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

vf_pad.c

Merge remote-tracking branch 'qatar/master'

2012-08-16 16:20:30 +02:00

vf_pixdesctest.c

Merge remote-tracking branch 'qatar/master'

2012-08-16 16:20:30 +02:00

vf_removelogo.c

vf_removelogo: fix permissions.

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

vf_scale.c

vf_scale: fix incompatible pointer type warning

2012-09-05 18:31:18 +02:00

vf_select.c

vf_select: require AV_PERM_PRESERVE.

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

vf_setfield.c

Merge remote-tracking branch 'qatar/master'

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

vf_showinfo.c

Merge remote-tracking branch 'qatar/master'

2012-08-16 16:20:30 +02:00

vf_slicify.c

Merge remote-tracking branch 'qatar/master'

2012-08-16 16:20:30 +02:00

vf_smartblur.c

lavfi: add smartblur filter

2012-08-28 19:48:16 +02:00

vf_super2xsai.c

Merge remote-tracking branch 'qatar/master'

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

vf_swapuv.c

Merge remote-tracking branch 'qatar/master'

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

vf_thumbnail.c

vf_thumbnail: fix permissions.

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

vf_tile.c

vf_tile: fix output buffer ownership.

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

vf_tinterlace.c

lavfi/tinterlace: declare source buffers in copy_picture_field() as const

2012-09-06 00:40:01 +02:00

vf_transpose.c

lavfi/transpose: implement landscape passthrough mode

2012-09-04 11:39:23 +02:00

vf_unsharp.c

Merge remote-tracking branch 'qatar/master'

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

vf_vflip.c

Merge remote-tracking branch 'qatar/master'

2012-08-16 16:20:30 +02:00

vf_yadif.c

Merge remote-tracking branch 'qatar/master'

2012-09-10 14:06:20 +02:00

video.c

lavfi: check that buffer and link properties match.

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

video.h

Merge commit 'fe1c1198e670242f3cf9e3e1eef27cff77f3ee23'

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

vsink_nullsink.c

Merge commit '23aae62c2cb4504a09ceb8cd0cabc1c8b260f521'

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

vsrc_cellauto.c

Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'

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

vsrc_life.c

Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'

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

vsrc_mandelbrot.c

Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'

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

vsrc_mptestsrc.c

Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'

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

vsrc_testsrc.c

Merge commit '23aae62c2cb4504a09ceb8cd0cabc1c8b260f521'

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

yadif.h

yadif: redesign first and last 2 lines handling.

2012-08-10 00:08:34 +02:00