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

And optionally forward them to the caller instead of concealing them.

Unify err and ret in a single variable.

At least 2 bytes from the source are read every loop.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org

Return the proper error values and optionally report them.

Report when zlib support is missing.

Some movies have negative composition time offsets in their trun, causing pts <
dts errors. This patch makes use of dts_shift to handle them.
Signed-off-by: Alexandre Sicard <alexandre.sicard@smartjog.com>

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

Fixes null pointer dereference

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

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

This is less confusing.
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>

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