* commit '3ecb82dd':
  dnxhddec: Fix pixel format change

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

* commit '6503cbf8':
  ffv1enc: Add const attribute to input frame

Conflicts:
	libavcodec/ffv1.h

no change, the changed field does not exist in FFmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Regression introduced in 598f7d04.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>

warning: assigning to 'AVFrame *' (aka 'struct AVFrame *') from
         'const AVFrame *' (aka 'const struct AVFrame *') discards
         qualifiers [-Wincompatible-pointer-types-discards-qualifiers]

decode all NAL units instead
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Reviewed-by: Nedeljko Babic <Nedeljko.Babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Found-by: jamrial
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>

Fix a duplicate memory allocation. priv_data should be allocated
in line 64 call to avformat_alloc_output_context2 since we pass
the correct AVFormat to it. This removes the duplicate allocation.
Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This also fixes intra-only MT failures (it was the same bug), see trac
4526 and 4527.
Tested-by: James Almer <jamrial@gmail.com>
Reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes make checkheaders
Signed-off-by: James Almer <jamrial@gmail.com>

* commit '06f4b1e3':
  avplay: Do not print a possibly uninitialized value

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

* commit 'e8c4db0d':
  xcbgrab: Validate the capture area
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '82a10225':
  xcbgrab: Do not assume the non shm image data is always available
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Use dyn_duf to write chunks so that we create the actual chunk
file only after the entire chunk data is available. This will help
not confuse other software looking at the chunk file (e.g. a web
server) by seeing a zero length file when ffmpeg is writing into
it.
Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Functions av_gt_sf, av_sqrt_sf and av_sincos_sf added to softfloat
Signed-off-by: Nedeljko Babic <nedeljko.babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This will normalize sums for which mantissa is smaller than the lower boundary
(needed for implementation of fixed point aac decoder).
Signed-off-by: Nedeljko Babic <nedeljko.babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Exponent usage and calculation in softfloat adjusted to the format used in
implementation of fixed point aac decoder.
Signed-off-by: Nedeljko Babic <nedeljko.babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Initialize `diff` to 0.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

And notify why the capture is impossible.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

The image decoding code does expect the image to be decoded immedeatly
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes regression decoding AVCI
Fixes Ticket4493
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

The code is already doing nothing if DEBUG is disabled
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes Detecting AAC with such descriptor if the parts needed for detection
are later in the stream
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

Check extended sync word for 16-bit LE and BE core streams to reduce
probability of alias sync detection. Previously sync word extension was
checked only for 14-bit streams (and this check did not properly work
across buffer boundary).

Use 64-bit parser state to make extended sync word detection work across
buffer boundary.

This is sufficient to make the sample in ticket #4492 parse
successfully.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'a09c499a':
  rawenc: properly allocate coded_frame

Conflicts:
	libavcodec/rawenc.c

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

* commit 'a0f29460':
  h264: use properly allocated AVFrames

Conflicts:
	libavcodec/h264.c
	libavcodec/h264.h
	libavcodec/h264_refs.c
	libavcodec/h264_slice.c
	libavcodec/svq3.c
	libavcodec/vda_h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '7a4f74ee':
  h264: embed the DPB in the context

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

Fixes fate-h264-lossless
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit '88c612e3':
  h264: merge the init and reinit paths in update_thread_context()

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

* commit '8a66fd40':
  h264: drop the reinit parameter from init_slice_header()
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'c9ccbc73':
  h264: update the current bit depth/chroma type in init_slice_header()
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '29dcde2b':
  h264: copy nal_length_size in update_thread_context
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '440e8dd3':
  h264: drop a comment that carries no useful information
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '11f024ef':
  h264: move freeing the escaped RBSP buffer to free_context()
Merged-by: Michael Niedermayer <michaelni@gmx.at>