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

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

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

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

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

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

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

This is similar to the other duplicated cases
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

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

Reviewed-by: NTimo Rothenpieler <timo@rothenpieler.org>
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

* commit '024e5a2d':
  rtmppkt: Repeat the full 32 bit timestamp for chunking continuation packets
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit 'def69553':
  h264_cabac: Break infinite loops

Conflicts:
	libavcodec/h264_cabac.c

See: cdf0877bMerged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit '402fb555':
  opus_parser: drop unused variable

See: 74141f69Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit '8a9641a6':
  bsf: check memory allocations

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

* commit '014b6b41':
  vp8: improve memory allocation checks
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit '54bc15d5':
  id3v2: fix reading v2.2 attached pictures

Conflicts:
	libavformat/id3v2.c

See: 05c3c568Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit '932788be':
  id3v2: add names to the parameters of ID3v2EMFunc.read

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

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

* commit '8809c974':
  id3v2: constify the 'tag' parameter to special metadata parsing callback

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

This fixes sending chunked packets (packets larger than the output
chunk size, which often can be e.g. 4096 bytes) with a timestamp delta
(or absolute timstamp, if it's a timestamp step backwards, or the
first packet of the stream) larger than 0xffffffff.

The RTMP spec explicitly says (in section 5.3.1.3.) that packets of
type 3 (continuation packets) should include this field, if the
previous non-continuation packet had it included.

The receiving code handles these packets correctly.

Pointed out by Cheolho Park.

CC: libav-stable@libav.org
Signed-off-by: NMartin Storsjö <martin@martin.st>

This fixes out of array reads and/or infinite loops.

30 is the maximum number of bits that can be read into
coeff_abs below.

CC: libav-stable@libav.org
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: NMartin Storsjö <martin@martin.st>

* commit 'f86f39cb':
  tiff: support decoding GBRP and GBRAP formats

Conflicts:
	libavcodec/tiff.c

See: 379ad978Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit '92806167':
  libswscale: GBRAP input & output and GBRAP16 input support

Conflicts:
	libswscale/input.c
	libswscale/swscale_internal.h
	libswscale/swscale_unscaled.c
	libswscale/utils.c
	tests/ref/fate/filter-pixdesc-gbrap
	tests/ref/fate/filter-pixfmts-copy
	tests/ref/fate/filter-pixfmts-null
	tests/ref/fate/filter-pixfmts-scale
	tests/ref/fate/filter-pixfmts-vflip

See: 5c057433Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit '9a4aaae3':
  lavc: add GBRAP to avcodec_align_dimensions2

See: 5c057433Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit '0e6c7dfa':
  lavu: add planar 16 bit and 8 bit rgb with alpha

Conflicts:
	libavutil/pixdesc.c
	libavutil/pixfmt.h
	libavutil/version.h

See: e6d4e687Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit 'e2ad0b66':
  imgutils: create misc functions for dealing with buffers

Conflicts:
	doc/APIchanges
	libavcodec/avcodec.h
	libavcodec/avpicture.c
	libavutil/imgutils.c
	libavutil/imgutils.h
	libavutil/version.h

See: e6674e46Merged-by: NMichael Niedermayer <michaelni@gmx.at>

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

The original code was intended purely for rotation == 0
In cf70ba37 the condition was
changed to use it only for rotation != 0
which broke the cases for which it was intended to be used
as well as breaking cases for which it was not intended to be
used.
This changes the code so it could work for the more general
case and fixes the regressions
If you have sample files that are not handled correctly
please open tickets or mail me!
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

* commit 'cf70ba37':
  mov: Check angle rather than full matrix when updating SAR
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit '1e763454':
  png: improve signature check

Conflicts:
	libavcodec/pngdec.c

See: 8a08503b
See: 0a3589bfMerged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit '456ffec3':
  img2dec: correctly use the parsed value from -start_number

No change, start_number works fine without this change
and does not work with it
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

Check memory earlier, check one more allocation and clean up on error.

CC: libav-stable@libav.org
Bug-Id: CID 1257773

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

Signed-off-by: NPaul B Mahol <onemda@gmail.com>
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

In v2.2, the picture type is not a zero-terminated string, but has a
constant size of 3 bytes.