Signed-off-by: NStefano Sabatini <stefano.sabatini-lala@poste.it>

Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

no comment

This reverts commit e6ff0648.

Conflicts:

	libavcodec/dsputil.c
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

* 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: NMichael Niedermayer <michaelni@gmx.at>

vsrc_buffer: 10l mixed up input & output sizes. (funnily this worked 99% of the time) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: NAnton Khirnov <anton@khirnov.net>
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

Signed-off-by: NAnton Khirnov <anton@khirnov.net>
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

Signed-off-by: NAnton Khirnov <anton@khirnov.net>
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

With cleanup & simplification by me
Signed-off-by: NAnton Khirnov <anton@khirnov.net>
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

Signed-off-by: NReinhard Tartler <siretart@tauware.de>

Signed-off-by: NReinhard Tartler <siretart@tauware.de>

Signed-off-by: NReinhard Tartler <siretart@tauware.de>

Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

Store palette data in the codec context, do not assume that the frame
allocated the first time by avctx->get_buffer will be returned again.

This requires to store the palette which comes with the first frame in
the context, and copy it to the following frames.

Fix trac issue #84.
Signed-off-by: NStefano Sabatini <stefano.sabatini-lala@poste.it>

Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>
Signed-off-by: NRonald S. Bultje <rbultje@google.com>

Signed-off-by: NAnton Khirnov <anton@khirnov.net>

Also deprecate av_get_pict_type_char() in favor of
av_get_picture_type_char().

The new enum and av_get_picture_type_char() are defined in libavutil.
This allows the use in libavfilter without the need to link against
libavcodec.
Signed-off-by: NStefano Sabatini <stefano.sabatini-lala@poste.it>
Signed-off-by: NAnton Khirnov <anton@khirnov.net>

Signed-off-by: NAnton Khirnov <anton@khirnov.net>

Signed-off-by: NStefano Sabatini <stefano.sabatini-lala@poste.it>
Signed-off-by: NAnton Khirnov <anton@khirnov.net>

Signed-off-by: NRoger Pau Monné <roger.pau@entel.upc.edu>
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>
Signed-off-by: NAnton Khirnov <anton@khirnov.net>

Also set movie->picref to NULL, in order to avoid a crash in uninit()
when movie->picref is unreffed again and it was already freed.
Signed-off-by: NStefano Sabatini <stefano.sabatini-lala@poste.it>
Signed-off-by: NAnton Khirnov <anton@khirnov.net>

Signed-off-by: NAnton Khirnov <anton@khirnov.net>

This fixes aspect handling in ffmpeg.

This is based on a patch by Baptiste.
Signed-off-by: NAnton Khirnov <anton@khirnov.net>

Signed-off-by: NStefano Sabatini <stefano.sabatini-lala@poste.it>
Signed-off-by: NAnton Khirnov <anton@khirnov.net>

Make the filter accept parametric expressions for the output video
size.
Signed-off-by: NStefano Sabatini <stefano.sabatini-lala@poste.it>
Signed-off-by: NAnton Khirnov <anton@khirnov.net>

Fixes by Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: NAnton Khirnov <anton@khirnov.net>

and correctly support grey8
Signed-off-by: NAnton Khirnov <anton@khirnov.net>

Signed-off-by: NAnton Khirnov <anton@khirnov.net>