* commit 'a1859032':
  flvdec: Do not default to a video and audio stream
Merged-by: Michael Niedermayer <michaelni@gmx.at>

The immediate value may be 0.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

The macro was not using the parameter but unconditionally using sse4.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

If no streams were indicated in the FLV header, do not automatically
allocate by default a video and an audio stream. Instead, in the case
that the header did not indicate the presence of any data, allocate no
stream until data actually arrives for one type.
Signed-off-by: Martin Storsjö <martin@martin.st>

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

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

If people want, this could be exported as av_opt_size()

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

This should make it simpler for users to test if such videos work

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

It is obviously nonsense since it produces wrong results
or even crashes (crashes should be encode-only though).
Fixes trac issue #1092.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This is the same as 5a15602a, which
accidentally did not get merged.
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>

* commit 'f76e3669':
  Decode both parts of Indeo4 IP frames

Conflicts:
	libavcodec/ivi_common.c
	libavcodec/ivi_common.h

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

* commit '3df0d200':
  Move Indeo4 frametypes into common header.

Conflicts:
	libavcodec/ivi_common.c

See: d24673a2Merged-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: Michael Niedermayer <michaelni@gmx.at>

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

* commit '38313626':
  avconv: do not use the stream codec context for encoding

Conflicts:
	ffmpeg.c
	ffmpeg_opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

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

The demuxer needs this value to generate correct timestamps in some corner cases
Ideally the parser would always set this correctly, but some parsers lac support
for extracting this value, also its not trivial.
This fixes a regression
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit '41776ba9':
  avconv: do not use the stream codec context for decoding

Conflicts:
	ffmpeg.c
	ffmpeg_filter.c
	ffmpeg_opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'e19d48df':
  flac muxer: support reading updated extradata from side data

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

* commit '0097cbea':
  flac muxer: accept only STREAMINFO extradata
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'ed39cda0':
  flacenc: send final extradata in packet side data
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '0957b274':
  lavc: add an option to enable side data-only packets during encoding

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

* commit 'eb800f12':
  libavcodec: set AVFrame colorspace fields on decoding

Conflicts:
	libavcodec/utils.c

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

* commit '8c02adc6':
  lavu: add all color-related enums to AVFrame

Conflicts:
	libavcodec/avcodec.h
	libavutil/frame.c
	libavutil/frame.h
	libavutil/version.h

The version check is changed so they are available with the current ABI
FFmpeg libs should have no problems with added fields, nor should any
application using the libs, and we regularly added fields in the past.
We also moved 2 of these fields to AVFrame already previously without issues.

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

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

* commit 'd2ef708c':
  matroskaenc: Allow VP9 and Opus in webm

Conflicts:
	libavformat/matroskaenc.c

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

Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>

Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>

The other format (full flac header blocks) should not be exported by any
demuxers anymore.

This allows to drop an avpriv_ function and also simplify the following
commits.