* commit '1961e46c':
  lavfi: remove disabled FF_API_FILTERS_PUBLIC cruft
  lavfi: remove disabled FF_API_DEFAULT_CONFIG_OUTPUT_LINK cruft
  lavfi: use proper FF_API guards for different deprecated functions
  lavfi: remove disabled FF_API_VSRC_BUFFER_ADD_FRAME cruft
  lavfi: remove disabled FF_API_SAMPLERATE64 cruft
  lavfi: remove disabled FF_API_GRAPH_AVCLASS cruft

Conflicts:
	libavfilter/avfilter.c
	libavfilter/avfilter.h
	libavfilter/buffersrc.c
	libavfilter/formats.c
	libavfilter/graphparser.c
	libavfilter/version.h
	libavfilter/video.c
	libavfilter/vsrc_buffer.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'a5e8c41c':
  lavfi: remove 'opaque' parameter from AVFilter.init()
  mov: do not try to read total disc/track number if data atom is too short.
  avconv: fix -force_key_frames
  dxva2_h264: fix signaling of mbaff frames
  x86: fft: elf64: fix PIC build

Conflicts:
	ffmpeg.c
	libavcodec/v210dec.h
	libavfilter/asrc_anullsrc.c
	libavfilter/buffersrc.c
	libavfilter/src_movie.c
	libavfilter/vf_drawtext.c
	libavfilter/vf_fade.c
	libavfilter/vf_overlay.c
	libavfilter/vsrc_color.c
	libavfilter/vsrc_testsrc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Free packets unconditionally after demuxing, and not only when the
packets belong to a given stream.
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>

Update the video filtering example program based on the audio one.
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>

In a 64-bit PIC build, external functions must be called
through the PLT.
Signed-off-by: Mans Rullgard <mans@mansr.com>

This reverts commit f7676584.

The bug it introduces has been fixed.

This reverts commit fd91a3ec.

The bug it introduced has been fixed.

It is not used in any filters currently and is inherently evil. If
passing binary data to filters is required in the future, it should be
done with some AVOptions-based system.

Fixes bug 308.
Signed-off-by: Anton Khirnov <anton@khirnov.net>

Move the lavc/imgconvert functions and rename them as follows:
avpicture_get_size -> av_image_get_buffer_size()
avpicture_fill     -> av_image_fill_arrays()
avpicture_layout   -> av_image_copy_to_buffer()

The new functions have an align parameter, which allows to define the
linesize alignment assumed in the buffer (which is set or read).

The names of the functions are consistent with the lavu/samples API
(av_samples_get_buffer_size(), av_samples_fill_arrays()).

parse_forced_keyframes() relies in encoder timebase being set, so call
it from transcode_init() after it is known.

This reverts commit 82992604.

It breaks shared builds on x86_64.

This reverts commit 8725da49.

Necerrary to revert 82992604.

Will help factorization with the pending -af patch, and add some checks
missing in the original code.

It was deprecated and removed after the recent 2->3 major bump.

It was deprecated since a long time and removed after the 2->3 major
bump.

The MBAFF flag may only be signaled if we're actually dealing with
a full frame, and not singular fields, as it can happen in mixed content.
Signed-off-by: Martin Storsjö <martin@martin.st>

Reviewed-by: Paul B Mahol

Reviewed-by: Paul B Mahol

* qatar/master:
  log: Include io.h on windows
  lavr: x86: merge some branches
  x86: cpu: whitespace (mostly) cosmetics
  x86: fft: win64: fix stack alignment for memcpy() call

Conflicts:
	libavutil/log.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Fixes Ticket1466
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Prevents out of array write.
Signed-off-by: Paul B Mahol <onemda@gmail.com>

Fixes Ticket1397
Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

In a 64-bit PIC build, external functions must be called
through the PLT.
Signed-off-by: Mans Rullgard <mans@mansr.com>

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

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

Simplify code.

Also show them in a more parsable/consistent fashion.

Group lavfi headers together, slightly improve readability.

This is required for isatty, which exists on MSVC and is found by
configure, but is provided by io.h instead of unistd.h.
Signed-off-by: Martin Storsjö <martin@martin.st>