* commit 'ba71c740':
  lavc: deprecate AVCodecContext.codec_name
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'e7fc9796':
  lavc: do not use AVCodecContext.codec_name in avcodec_string()

Conflicts:
	libavcodec/utils.c

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

* commit 'ef973216':
  rmdec: do not export anything to AVCodecContext.codec_name
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '6072184e':
  asfenc: use codec descriptors instead of AVCodecs to write codec info

Conflicts:
	tests/ref/lavf/asf
	tests/ref/seek/lavf-asf
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '92e4b643':
  oggparseskeleton: do not use AVCodecContext.codec_name
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '18f2514c':
  mov: export stsd Compressorname in metadata

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

* commit 'a2941c8c':
  lavc: move CODEC_FLAG_MV0 to mpegvideo

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

* commit '64841491':
  lavc: make the xvid-specific "gmc" flag a private option of libxvid

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

* commit 'b2c31710':
  lavc: move CODEC_FLAG_NORMALIZE_AQP to mpegvideo

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

* commit '5fccedaa':
  lavc: deprecate CODEC_FLAG_INPUT_PRESERVED

Conflicts:
	doc/APIchanges
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '141fdc76':
  matroska: add the Opus mapping

Conflicts:
	libavformat/matroska.c

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

* commit 'a1aa37dd':
  matroskaenc: write CodecDelay

Conflicts:
	libavformat/matroskaenc.c
	tests/ref/lavf/mkv
	tests/ref/seek/lavf-mkv

This is largely not merged as it causes assertion failures and av sync errors
Further investigation of this is warranted if the changes are found to
fix/improve something in relation to d92b1b1b

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

* commit '1c0210c7':
  lavfi: add Bauer stereo-to-binaural audio filter

Conflicts:
	Changelog
	configure
	doc/filters.texi
	libavfilter/Makefile
	libavfilter/allfilters.c
	libavfilter/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: ValdikSS <iam@valdikss.org.ru>

It is undocumented and has no real use.

That field will be deprecated.

That field will be deprecated and the value that is written there is not
particularly useful.

Also, stop using AVCodecContext.codec_name as fallback, since it will be
deprecated.

Changes the result of the lavf-asf test (and its associated seektest),
since 'msmpeg4v3' gets written instead of just 'msmpeg4'.

That field is undocumented, of dubious use, and will be deprecated.

Stop using the undocumented to-be-deprecated AVCodecContext.codec_name
field.

The addition of reference-counted frames makes it pointless.

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

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

* commit 'eb3b5501':
  matroskadec: read the CodecDelay element

Conflicts:
	libavformat/matroska.h
	libavformat/matroskadec.c

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

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

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

This avoids a dependancy of libavfilter on libavcodec

See Ticket 3592
Fixes Ticket2784
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

fate/hevc: update with new sequences from jctvc(cherry picked from commit de6d9c586bd3852dfbe629a88ccc8c0f0a2bfcbb)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit '7d027b9d':
  librtmp: Map native options to librtmp ones when possible
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '7266e24f':
  hls: Sync the file number with the start sequence

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

* commit 'a1643103':
  hls: Factor the sequence computation

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