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

* lukaszmluki/master:
  lavd/xv: reident after previous commits
  lavf/mux: pass options to nested structs of priv data
  lavu/opt: add av_opt_set_dict2() function
  lavd/opengl_enc: fix window size correction code
  lavd/opengl_enc: add window size param
  lavd/opengl_enc: use flag to mark inited context
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>

This commit allows to benefit from implementing child_next
callback for muxers' AVClasses.
Without that, options cannot be set in nested structs.
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>

Existing av_opt_set_dict doesn't accept flags.
It doesn't allow to pass options to nested structs.
New function alllows that.
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>

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

This allows analyzing videos without having prior and current frames mixed
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

Found-by: wm4
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: Michael Niedermayer <michaelni@gmx.at>

This is purely a cosmetic change
Suggested-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

Files produced by windows media center contain meaningless mpeg1 sequence
header. The mpeg2 decoder detects the presence mpeg1 sequence header start
codes and attempts to decode the stream as mpeg1. (This problem introduced
in 73a2d16b.)

Fixes ticket #3601.
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* 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.