* commit '2578f1ef':
  riff: Support ULH0 and ULH2 fourccs.
  utvideodec: Support ULH0 and ULH2 formats.

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

Also prevents an error since the native decoder (if enabled) is
always used to probe Ut Video-encoded files, even if the user
forces libutvideo to be the decoder. Without this patch, the probe
would fail, and the video wouldn't get properly handed over,
resulting in failure to set codec parameters. When the native
decoder is disabled, libutvideo can probe and initialize decoding
without issues.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

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

Fixes order of operations
Fixes CID1030350
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

Messages may start with a carriage return.

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

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

Fixes out of array access

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes null pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

w/h from input frame are not copied in av_frame_copy_props(). This
commit avoids a mismatch between aligned_[wh] and outbuf->{width,height}
(and thus avoids triggering an assert in avfilter because of this).

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

This fixes a infinite loop
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

* lukaszmluki/master:
  ftp: add invalid code for RETR operation
  ftp: probe seek capability
  ftp: fix seeking beyond file size
  ftp: abort function optimalization
  ftp: explicit return code checks
  ftp: fix flush control connection input
  ftp: reconnect on tcp read error
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

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

* qatar/master:
  faxcompr: return meaningful errors

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

* commit 'f32aefcf':
  faxcompr: K&R formatting cosmetics

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

* commit '9c221697':
  tiff: do not overread the source buffer

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

* commit '999ccd2d':
  tiff: cleanup the error paths

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

* commit '016c5b06':
  tiff: refactor fax support in a separate function

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

* commit '10393768':
  tiff: refactor deflate support in a separate function

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

* commit 'f8a4d5e9':
  h264_parser: K&R formatting cosmetics
  vorbis: return meaningful errors

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

554 is possible invalid code:
- Restart not valid
- Command terminated due to server shutdown in progress
- etc...
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>

Make FTP streamed when server doesn't accept REST command
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>

adjust to ff* tools seek nature
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>

It seems some ftp servers doesn't respect ABOR command,
but closing both connection is slow.

This commit keeps control connection open when possible.
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>

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

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

This commit reconnect both connections and retries before ftp_read returns an error.
Practical use case: resume after lock screen on iOS devices.
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>

Fixes out of array access

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* cehoyos/master:
  Do not offer smvjpeg lowres capabilities, the decoder does not support it.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Fixes out of array access

If some valid files fail this check then please open a ticket and ping me and the smvjpegdec maintainer.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Reviewed-by: Ash Hughes