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

* commit 'a4fbd55d':
  h264: er: Copy from the previous reference only if compatible

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

* commit '9af7e804':
  lavc: Clarify the behaviour of dimension and format context fields

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

* commit '03ca6d70':
  x264: Factor out the reconfiguration code

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

* commit '24ad3ac6':
  nut: Drop doxygen markers

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

Signed-off-by: James Zern <jzern@google.com>

Signed-off-by: James Zern <jzern@google.com>

* commit '07b2db81':
  riff: Add MNM4 FourCC as mpeg4
Merged-by: Michael Niedermayer <michaelni@gmx.at>

modeled after the libx264 section.
Reviewed-by: Lou Logan <lou@lrcd.com>
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: James Zern <jzern@google.com>

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

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

This is more robust.

And only check if there is actually a frame returned.
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>

Also use the frame pixel format instead of the one from the codec
context, which is more robust.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>

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

This way it is available to any functions called from ff_mqc_initdec()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Also use the frame pixel format instead of the one from the codec
context, which is more robust.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

The AVCodecContext width, height, coded_width, coded_height and format
are used mainly as decoding hints and they get internally overwritten
during the data parsing stage.

Do not assume they match the last AVFrame provided by
avcodec_decode_video2 and assimilated functions since multi-threading
and other frame reordering might make those values to refer to frames
that will be outputted in the future.

CC: libav-stable@libav.org

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

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

Fixes out of array read
Fixes Ticket4627
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes Ticket4625
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 '74ea1167':
  tls_gnutls: fix hang on disconnection

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

Fixes Ticket 4624
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>

If this occurs on valid and correctly decoded files it should be reduced to debug
level
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

GNUTLS_SHUT_RDWR means GnuTLS will keep waiting for the server's
termination reply. But since we don't shutdown the TCP connection at
this point yet, GnuTLS will just keep skipping actual data from the
server, which basically is perceived as hang.

Use GNUTLS_SHUT_WR instead, which doesn't have this problem.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

It was previously shown just for some, this makes it consistent
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

GNUTLS_SHUT_RDWR means GnuTLS will keep waiting for the server's
termination reply. But since we don't shutdown the TCP connection at
this point yet, GnuTLS will just keep skipping actual data from the
server, which basically is perceived as hang.

Use GNUTLS_SHUT_WR instead, which doesn't have this problem.
Signed-off-by: Martin Storsjö <martin@martin.st>

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

Neccessary -> Necessary
formated   -> formatted
thee       -> the
eventhough -> even though
seperately -> separately
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>

avcodec/jpeg2000dec: Handle format that has planes matching YUVA420P structure but seems not to be that

Outputs something for p0_05.j2k
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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