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

..

APIchanges

Merge remote branch 'qatar/master'

2011-04-27 03:51:04 +02:00

avutil.txt

misc spelling fixes

2007-06-12 09:29:25 +00:00

bitstream_filters.texi

Revert "replace FFmpeg with Libav in doc/"

2011-03-17 17:26:45 +01:00

build_system.txt

Revert some silly renamings that leaked in from a pull.

2011-03-29 02:27:13 +02:00

demuxers.texi

Merge remote branch 'qatar/master'

2011-04-22 03:54:30 +02:00

developer.texi

doc: update developer guide

2011-04-13 10:01:14 +02:00

encoders.texi

Merge remote-tracking branch 'newdev/master'

2011-03-28 01:50:36 +02:00

eval.texi

eval: add support for trunc, ceil, and floor functions

2011-04-10 09:24:21 +02:00

faq.texi

Merge remote branch 'qatar/master'

2011-04-24 03:41:22 +02:00

fate.txt

Merge remote-tracking branch 'newdev/master'

2011-03-26 03:06:30 +01:00

ffmpeg-mt-authorship.txt

Include authorship information from ffmpeg-mt at Ronald S. Bultjes request.

2011-04-19 01:17:59 +02:00

ffmpeg.texi

documentation: extend documentation for ffmpeg -aspect option

2011-04-26 09:08:27 +02:00

ffplay.texi

Merge remote branch 'qatar/master'

2011-04-24 03:41:22 +02:00

ffprobe.texi

Merge remote branch 'qatar/master'

2011-04-24 03:41:22 +02:00

ffserver.conf

Update the url to the site website and change ffmpeg-devel to libav-devel

2011-03-13 18:45:29 -04:00

ffserver.texi

Merge remote branch 'qatar/master'

2011-04-24 03:41:22 +02:00

fftools-common-opts.texi

Revert "replace FFmpeg with Libav in doc/"

2011-03-17 17:26:45 +01:00

filters.texi

pad: make the filter parametric

2011-04-26 07:43:34 +02:00

general.texi

Add MxPEG decoder

2011-04-26 22:06:13 +02:00

git-howto.txt

fix typo

2011-04-10 04:31:54 +02:00

indevs.texi

Merge remote-tracking branch 'newdev/master'

2011-03-29 02:46:11 +02:00

issue_tracker.txt

Replace more FFmpeg instances by Libav or ffmpeg.

2011-04-23 19:12:23 +02:00

libavfilter.texi

Revert "replace FFmpeg with Libav in doc/"

2011-03-17 17:26:45 +01:00

metadata.texi

Revert "replace FFmpeg with Libav in doc/"

2011-03-17 17:26:45 +01:00

multithreading.txt

Revert "replace FFmpeg with Libav in doc/"

2011-03-17 17:26:45 +01:00

muxers.texi

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

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

optimization.txt

fix another forgotten mplayerhq.hu link

2011-04-08 01:35:43 +02:00

outdevs.texi

Merge remote-tracking branch 'newdev/master'

2011-03-28 01:50:36 +02:00

protocols.texi

Merge remote branch 'qatar/master'

2011-04-08 02:50:13 +02:00

rate_distortion.txt

The definition of rate and distortion is not conditional of lambda being

2009-03-30 10:39:20 +00:00

snow.txt

Use a consistent capitalization for 'Snow' as discussed on the list

2008-02-08 19:17:46 +00:00

soc.txt

Revert "replace FFmpeg with Libav in doc/"

2011-03-17 17:26:45 +01:00

swscale.txt

Update SW scaler doc after libswscale commit 30841.

2010-03-05 08:34:31 +00:00

t2h.init

doc: modify style for texi2html 1.78+

2011-01-30 03:41:47 +01:00

tablegen.txt

Update tablegen documentation for WRITE_ARRAY macro.

2010-06-27 14:31:50 +00:00

texi2pod.pl

support @heading, @subheading, @subsubheading, and @subsubsection in

2011-03-25 09:48:31 -04:00

TODO

Documentation updates for the git migration

2011-02-09 03:33:54 +01:00

viterbi.txt

Quick description of the Viterbi algorithm so I do not have to repeat it

2009-03-03 15:35:20 +00:00