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

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>

* commit 'dc6ea00c':
  mpeg4video: K&R formatting cosmetics

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

* commit '037fea38':
  flashsv: K&R formatting cosmetics

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

* commit '1700b4e6':
  x86: vp8dsp: Split loopfilter code into a separate file

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

* commit '056fd4fe':
  configure: Properly check for availability of -Wno-foo warning flags

Conflicts:
	configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '23157d72':
  configure: Split test_cflags function off from check_cflags
Merged-by: Michael Niedermayer <michaelni@gmx.at>

HDS fragments basically are FLV fragments wrapped in an ISO
media mdat atom.
Signed-off-by: Martin Storsjö <martin@martin.st>

* commit 'd1c229cd':
  lavf: do not use int to store an int64

Conflicts:
	libavformat/utils.c

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

* commit '57070b14':
  flashsv: Check diff_start diff_height values

Conflicts:
	libavcodec/flashsv.c

See: 880c73cdMerged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '4a64e679':
  flashsv: Refactor a little
Merged-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>

Also improve some log message wording/spelling.
Signed-off-by: Diego Biurrun <diego@biurrun.de>

For some weird reason gcc does not check if the -Wno disabling variants
of warning flags match existing warning flags. Instead it swallows them
silently. That is, unless other warning or error messages are generated,
because then - for some even more bizarre reason - a complaint about the
unknown disable warning flag is issued along with the error or warning
message.

Thus to check for the availability of a warning disabling option, one
needs to check for the enabling variant instead and then add the
disabling variant to CFLAGS.

This is useful to test flags without directly adding them to CFLAGS.

Signed-off-by: Paul B Mahol <onemda@gmail.com>

Signed-off-by: Paul B Mahol <onemda@gmail.com>

Signed-off-by: Paul B Mahol <onemda@gmail.com>