Michael Niedermayer 73a502dd43 Merge branch 'master' into oldabi ...

* master: (37 commits)
  vsrc_buffer: 10l mixed up input & output sizes. (funnily this worked 99% of the time) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
  Add MxPEG decoder
  Add support for picture_ptr field in MJpegDecodeContext
  Move MJPEG's input buffer preprocessing in separate public function
  Support reference picture defined by bitmask in MJPEG's SOS decoder
  DCA/DTA encoder
  vsrc_buffer: Reinit scale filter when an existing filter is used. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
  vsrc_buffer: set output timebase when output equalization is done Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
  vsrc_buffer: Set output size Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
  vsrc_buffer: fix NULL dereference Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
  bfi: store palette data in the context
  Fix issue1503, this fix may be incomplete we need more samples to know for sure. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
  wmadec: prevent null pointer call. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
  fraps: do not set avctx->pix_fmt to none in decode_init()
  graphparser: add a NULL check on the argument passed to strstr
  setdar: prefer "sar" over "par" in log info message
  fade: fix draw_slice() check on fade->factor value
  fade: make draw_slice() chroma check against planes 1 and 2
  lsws: prevent overflow in sws_init_context()
  ffplay: fix logic for selecting the show mode in case of missing video
  ...

Conflicts:
	libavformat/avidec.c

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

2011-04-27 00:11:58 +02:00

..

libmpcodecs

mp: remove use of deprecated old eval API

2011-04-21 18:45:56 +02:00

x86

Align stack variables manually in yadif x86 code, should fix ticket25

2011-04-07 01:49:06 +02:00

af_anull.c

Replace FFmpeg with Libav in licence headers

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

allfilters.c

lavfi: add fieldorder filter

2011-04-11 00:14:21 +02:00

asink_anullsink.c

Replace FFmpeg with Libav in licence headers

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

asrc_anullsrc.c

Replace FFmpeg with Libav in licence headers

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

avfilter.c

Replace FFmpeg with Libav in licence headers

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

avfilter.h

Merge branch 'master' into oldabi

2011-04-25 03:49:47 +02:00

avfiltergraph.c

Replace FFmpeg with Libav in licence headers

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

avfiltergraph.h

Replace FFmpeg with Libav in licence headers

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

defaults.c

Replace FFmpeg with Libav in licence headers

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

drawutils.c

Replace FFmpeg with Libav in licence headers

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

drawutils.h

Replace FFmpeg with Libav in licence headers

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

formats.c

Replace FFmpeg with Libav in licence headers

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

gradfun.h

Replace FFmpeg with Libav in licence headers

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

graphparser.c

graphparser: add a NULL check on the argument passed to strstr

2011-03-30 22:16:08 +02:00

internal.h

Replace FFmpeg with Libav in licence headers

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

libavfilter.v

Add symbol versioning for shared libraries

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

Makefile

lavfi: add fieldorder filter

2011-04-11 00:14:21 +02:00

vf_aspect.c

setdar: prefer "sar" over "par" in log info message

2011-03-27 16:27:05 +02:00

vf_blackframe.c

Replace FFmpeg with Libav in licence headers

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

vf_copy.c

Replace FFmpeg with Libav in licence headers

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

vf_crop.c

Make the crop filter accept PIX_FMT_BGR48LE and PIX_FMT_BGR48BE pixel formats

2011-03-26 13:24:36 +11:00

vf_cropdetect.c

Replace FFmpeg with Libav in licence headers

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

vf_drawbox.c

Replace FFmpeg with Libav in licence headers

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

vf_drawtext.c

drawtext: allow negative shadow offset values

2011-04-02 11:48:01 +02:00

vf_fade.c

10l, commit that should have been stashed into the merge.

2011-04-17 23:59:00 +02:00

vf_fieldorder.c

lavfi: add fieldorder filter

2011-04-11 00:14:21 +02:00

vf_fifo.c

Replace FFmpeg with Libav in licence headers

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

vf_format.c

Replace FFmpeg with Libav in licence headers

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

vf_frei0r.c

Replace FFmpeg with Libav in licence headers

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

vf_gradfun.c

Replace FFmpeg with Libav in licence headers

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

vf_hflip.c

Make the hflip filter accept PIX_FMT_BGR48LE and PIX_FMT_BGR48BE pixel formats

2011-03-26 13:24:41 +11:00

vf_hqdn3d.c

Replace FFmpeg with Libav in licence headers

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

vf_libopencv.c

ocv: replace FF_INTERNAL_MEM_TYPE_MAX_VALUE with SIZE_MAX

2011-04-21 10:33:03 +02:00

vf_mp.c

mp: remove unused variable outlink in end_frame

2011-04-21 18:46:03 +02:00

vf_null.c

Replace FFmpeg with Libav in licence headers

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

vf_overlay.c

Replace FFmpeg with Libav in licence headers

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

vf_pad.c

pad: make the filter parametric

2011-04-19 15:28:01 +02:00

vf_pixdesctest.c

Replace FFmpeg with Libav in licence headers

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

vf_scale.c

scale: set evaluated value for the "out_w" and "out_h" constants

2011-04-17 17:33:00 +02:00

vf_setpts.c

Replace FFmpeg with Libav in licence headers

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

vf_settb.c

Replace FFmpeg with Libav in licence headers

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

vf_slicify.c

Replace FFmpeg with Libav in licence headers

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

vf_transpose.c

Replace FFmpeg with Libav in licence headers

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

vf_unsharp.c

Replace FFmpeg with Libav in licence headers

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

vf_vflip.c

Replace FFmpeg with Libav in licence headers

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

vf_yadif.c

Update yadif copyright header

2011-04-05 03:21:36 +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: 10l mixed up input & output sizes. (funnily this worked 99% of the time) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

2011-04-26 23:55:04 +02:00

vsrc_buffer.h

vsrc_buffer.h: add file doxy

2011-04-11 11:29:35 +02:00

vsrc_color.c

Replace FFmpeg with Libav in licence headers

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

vsrc_movie.c

Added key_frame and pict_type to vsrc_movie

2011-04-18 20:40:15 +02:00

vsrc_nullsrc.c

Replace FFmpeg with Libav in licence headers

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

yadif.h

Change yadif to not use out of picture lines.

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