ffmpeg/libavfilter
Michael Niedermayer d7e5aebae7 Merge remote branch 'qatar/master'
* qatar/master: (23 commits)
  ac3enc: correct the flipped sign in the ac3_fixed encoder
  Eliminate pointless '#if 1' statements without matching '#else'.
  Add AVX FFT implementation.
  Increase alignment of av_malloc() as needed by AVX ASM.
  Update x86inc.asm from x264 to allow AVX emulation using SSE and MMX.
  mjpeg: Detect overreads in mjpeg_decode_scan() and error out.
  documentation: extend documentation for ffmpeg -aspect option
  APIChanges: update commit hashes for recent additions.
  lavc: deprecate FF_*_TYPE macros in favor of AV_PICTURE_TYPE_* enums
  aac: add headers needed for log2f()
  lavc: remove FF_API_MB_Q cruft
  lavc: remove FF_API_RATE_EMU cruft
  lavc: remove FF_API_HURRY_UP cruft
  pad: make the filter parametric
  vsrc_movie: add key_frame and pict_type.
  vsrc_movie: fix leak in request_frame()
  lavfi: add key_frame and pict_type to AVFilterBufferRefVideo.
  vsrc_buffer: add sample_aspect_ratio fields to arguments.
  lavfi: add fieldorder filter
  scale: make the filter parametric
  ...

Conflicts:
	Changelog
	doc/filters.texi
	ffmpeg.c
	libavcodec/ac3dec.h
	libavcodec/dsputil.c
	libavfilter/avfilter.h
	libavfilter/vf_scale.c
	libavfilter/vf_yadif.c
	libavfilter/vsrc_buffer.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-27 03:51:04 +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-26 07:37:41 +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 remote branch 'qatar/master' 2011-04-27 03:51:04 +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-04-25 22:45:44 +02:00
internal.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
libavfilter.v
Makefile lavfi: add fieldorder filter 2011-04-26 07:37:41 +02:00
vf_aspect.c setdar: prefer "sar" over "par" in log info message 2011-04-25 22:45:44 +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 fade: fix draw_slice() check on fade->factor value 2011-04-25 22:45:44 +02:00
vf_fieldorder.c lavfi: add fieldorder filter 2011-04-26 07:37:41 +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-26 07:43:34 +02:00
vf_pixdesctest.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
vf_scale.c Merge remote branch 'qatar/master' 2011-04-27 03:51:04 +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 Merge remote branch 'qatar/master' 2011-04-27 03:51:04 +02:00
vsink_nullsink.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
vsrc_buffer.c Merge remote branch 'qatar/master' 2011-04-27 03:51: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 vsrc_movie: add key_frame and pict_type. 2011-04-26 07:43:16 +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