Michael Niedermayer 259a960f1b Merge remote-tracking branch 'qatar/master' ...

* qatar/master:
  vp6: Fix illegal read.
  avfilter: Don't copy garbage from the stack when setting up video pictures.
  avcodec: Make sure codec_type is set by avcodec_get_context_defaults2
  avcodec: Remove a misplaced and useless attribute_deprecated
  avconv: add -dump_attachment option.
  avconv: add -attach option.
  avconv: make negative mappings disable only streams from the specified file
  fmtconvert: fix int32_to_float_fmul_scalar() for windows x86_64

Conflicts:
	libavcodec/options.c

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

2011-11-04 01:44:06 +01:00

..

libmpcodecs

Replace all strcasecmp/strncasecmp usages.

2011-11-03 19:25:26 +01:00

x86

Merge remote-tracking branch 'qatar/master'

2011-07-05 02:26:17 +02:00

af_aconvert_rematrix.c

lavfi: add audio convert filter

2011-09-16 20:44:27 +02:00

af_aconvert.c

lavu: add av_strtok()

2011-10-18 18:21:03 +02:00

af_aformat.c

lavu: add av_strtok()

2011-10-18 18:21:03 +02:00

af_anull.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

af_aresample.c

af_aresample: fix properties setting in the output buffer

2011-10-16 00:52:23 +02:00

af_ashowinfo.c

ashowinfo: fix typo in description.

2011-10-27 22:16:24 +02:00

all_channel_layouts.h

lavfi: add avfilter_all_channel_layouts public symbol

2011-09-16 00:46:41 +02:00

allfilters.c

lavfi: add rgbtestsrc source, ported from MPlayer libmpcodecs

2011-10-19 07:09:08 +02:00

asink_anullsink.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

asrc_abuffer.c

lavu: add av_strtok()

2011-10-18 18:21:03 +02:00

asrc_abuffer.h

lavfi: add asrc_abuffer - audio buffer source

2011-08-21 11:37:57 +02:00

asrc_aevalsrc.c

asrc_aevalsrc: apply misc cleanup in the options array

2011-10-18 18:52:50 +02:00

asrc_anullsrc.c

AVOptions: rename remaining FF_OPT_TYPE_* to AV_OPT_TYPE_*.

2011-10-17 07:33:10 +02:00

avcodec.c

libavfilter: implement avfilter_fill_frame_from_video_buffer_ref()

2011-06-12 22:46:02 +02:00

avcodec.h

libavfilter: implement avfilter_fill_frame_from_video_buffer_ref()

2011-06-12 22:46:02 +02:00

avfilter.c

Merge remote-tracking branch 'qatar/master'

2011-11-04 01:44:06 +01:00

avfilter.h

lavfi: bump micro after recent changes in the overlay filter

2011-10-31 11:19:53 +01:00

avfiltergraph.c

lavfi: fix signature for avfilter_graph_parse() and avfilter_graph_config()

2011-09-28 08:02:53 +02:00

avfiltergraph.h

Merge remote-tracking branch 'qatar/master'

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

buffersink.h

lavfi: rename vsink_buffer.c to sink_buffer.c, and vsink_buffer.h to buffersink.h

2011-09-06 18:51:09 +02:00

defaults.c

lavfi: rename avfilter_all_* function names to avfilter_make_all_*

2011-09-16 00:42:47 +02:00

drawutils.c

lavfi: add internal function ff_fill_rgba_map()

2011-10-28 02:06:50 +02:00

drawutils.h

lavfi: add internal function ff_fill_rgba_map()

2011-10-28 02:06:50 +02:00

formats.c

lavfi: add LUT (LookUp Table) generic filters

2011-10-17 18:05:38 +02:00

gradfun.h

Add some forgotten const to function arguments in libavfilter & libavformat.

2011-05-17 03:05:36 +02:00

graphparser.c

lavfi: fix signature for avfilter_graph_parse() and avfilter_graph_config()

2011-09-28 08:02:53 +02:00

internal.h

lavfi: add LUT (LookUp Table) generic filters

2011-10-17 18:05:38 +02:00

libavfilter.v

Add symbol versioning for shared libraries

2010-01-16 04:49:02 +00:00

Makefile

lavfi: rewrite nullsrc using the code in vsrc_testsrc.c

2011-10-24 17:46:48 +02:00

sink_buffer.c

sink_buffer: fix typo

2011-09-28 22:28:47 +02:00

src_movie.c

src_movie: Fix incompatible pointer type warning.

2011-10-19 00:03:56 +02:00

transform.c

doxygen: remove a few @file parameters.

2011-10-04 08:04:17 +02:00

transform.h

lavfi: add missing header mulitple-inclusion guard in transform.h

2011-10-20 15:59:20 +02:00

vf_aspect.c

Merge remote-tracking branch 'qatar/master'

2011-07-04 00:45:21 +02:00

vf_blackframe.c

vf_blackframe: port missing features from libmpcodecs blackframe

2011-07-21 13:04:48 +02:00

vf_boxblur.c

vf_boxblur: fix slice-drawing

2011-10-23 23:54:37 +02:00

vf_copy.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

vf_crop.c

vf_crop: remove mathematical constants now redundant.

2011-10-13 18:08:51 +02:00

vf_cropdetect.c

lavfi: add layout negotiation fields and helper functions.

2011-06-19 22:58:32 +02:00

vf_delogo.c

Merge remote-tracking branch 'qatar/master'

2011-10-18 01:54:40 +02:00

vf_deshake.c

deshake: limit deshake to specific area to search for motion vectors.

2011-10-20 00:39:34 +02:00

vf_drawbox.c

Merge remote-tracking branch 'qatar/master'

2011-08-26 23:18:54 +02:00

vf_drawtext.c

Merge remote-tracking branch 'qatar/master'

2011-11-03 02:16:26 +01:00

vf_fade.c

vf_fade: fade to correct CCIR601/709 black level

2011-11-02 21:44:13 +01:00

vf_fieldorder.c

Remove unused variables

2011-06-02 20:06:00 +01:00

vf_fifo.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

vf_format.c

lavfi: add ff_parse_pixel_format() internal function, and use it

2011-08-23 15:45:44 +02:00

vf_frei0r.c

lavu: add av_strtok()

2011-10-18 18:21:03 +02:00

vf_gradfun.c

lavfi: add layout negotiation fields and helper functions.

2011-06-19 22:58:32 +02:00

vf_hflip.c

lavfi: add layout negotiation fields and helper functions.

2011-06-19 22:58:32 +02:00

vf_hqdn3d.c

lavfi: add layout negotiation fields and helper functions.

2011-06-19 22:58:32 +02:00

vf_libopencv.c

vf_libopencv: replace opencv/cxtypes.h #include by opencv/cxcore.h

2011-07-18 12:33:13 +02:00

vf_lut.c

Merge remote-tracking branch 'qatar/master'

2011-10-18 01:54:40 +02:00

vf_mp.c

vf_mp: Fix several incompatible pointer type warnings.

2011-10-19 00:05:30 +02:00

vf_null.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

vf_overlay.c

vf_overlay: adopts FAST_DIV255 macro for calculating destination alpha

2011-11-02 21:44:13 +01:00

vf_pad.c

vf_pad: Fix alignment of get_video_buffer()

2011-10-27 03:46:09 +02:00

vf_pixdesctest.c

vf_pixdesctest: Fix incompatible pointer type warning.

2011-10-18 23:59:59 +02:00

vf_scale.c

vf_scale: Request an aligned buffer.

2011-10-27 03:46:50 +02:00

vf_select.c

vf_select: remove mathematical constants now redundant.

2011-10-13 18:08:50 +02:00

vf_setpts.c

vf_setpts: remove mathematical constants now redundant.

2011-10-13 18:08:50 +02:00

vf_settb.c

vf_settb: remove mathematical constants now redundant.

2011-10-13 18:08:50 +02:00

vf_showinfo.c

vf_showinfo: print checksums in hexadecimal.

2011-10-27 22:14:57 +02:00

vf_slicify.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

vf_split.c

lavfi: add split filter from soc.

2011-09-12 08:48:16 +02:00

vf_transpose.c

vf_transpose: remove pix_fmts which can currently not be supported.

2011-11-01 23:45:28 +01:00

vf_unsharp.c

vf_unsharp: Fix false ‘src2’ may be used uninitialized in this function warning.

2011-10-19 00:04:33 +02:00

vf_vflip.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

vf_yadif.c

yadif: Fix assignment from incompatible pointer type warning

2011-10-18 23:59:20 +02:00

vsink_nullsink.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

vsrc_buffer.c

vsrc_buffer: FIx incompatible pointer type warning

2011-10-18 23:58:41 +02:00

vsrc_buffer.h

vsrc_buffer: remove duplicated file description

2011-09-19 12:43:10 +02:00

vsrc_color.c

vsrc_color: use internal timebase

2011-09-28 08:03:11 +02:00

vsrc_mptestsrc.c

AVOptions: rename remaining FF_OPT_TYPE_* to AV_OPT_TYPE_*.

2011-10-17 07:33:10 +02:00

vsrc_testsrc.c

Merge remote-tracking branch 'qatar/master'

2011-11-03 02:16:26 +01:00

yadif.h

Change yadif to not use out of picture lines.

2011-04-03 08:46:19 +02:00