Also make AVCODEC_RESAMPLE API removal depends on its presence, since its
code depends on it as well.
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>

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

* commit '3ea5f64f':
  ansi: fix possible use of uninitialized variables

Conflicts:
	libavcodec/ansi.c

Only partially merged, ffmpeg is not affected by this.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'c0bba95c':
  wtv: fix variable sign in format
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '5858a67f':
  attributes: disable flatten on llvm/clang
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '3a14b160':
  vf_scale: make the dar variable return the DAR.

Conflicts:
	Changelog
	doc/filters.texi
	libavfilter/version.h

See: 61d55fdaMerged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '34a0ac41':
  vf_aspect: support variables in evaluating the aspect ratios

Conflicts:
	Changelog
	doc/filters.texi
	libavfilter/vf_aspect.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

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

This excludes many changes that worsen readability
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

this is valid for both vp8 & vp9 and necessary for lossless in the
latter
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

same as their vpxenc equivalents:
-lossless
-tile-columns
-tile-rows
-frame-parallel
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

This reduces their size from O(n) to O(1)

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

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

Before, it just returned width/height. Correct is width/height*sar.

That way it is consistent with DAR as in probe output and setdar.
Signed-off-by: Rudolf Polzer <divverent@xonotic.org>
Signed-off-by: Anton Khirnov <anton@khirnov.net>

Example: -vf setsar=sar="sar*9/10"
Signed-off-by: Rudolf Polzer <divverent@xonotic.org>
Signed-off-by: Anton Khirnov <anton@khirnov.net>

the current options are left for both to provide command line compatibility
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* qatar/master:
  os_support: Add #endif comments for better readability
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'c68d4c23':
  mpeg4video_parser: K&R formatting cosmetics

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

avcodec/hevc: add "apply_defdispwin" alias for compatibilty with 064698d3Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

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

libavcodec/hevcdsp_template: random cosmetics to reduce diff to 064698d3Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

libavcodec/hevc: indention related cosmetics to reduce diff to 064698d3Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

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

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

Signed-off-by: Diego Biurrun <diego@biurrun.de>

* qatar/master:
  Add an HDS live fragmenting muxer

Conflicts:
	Changelog
	libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>