* 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>

* commit 'ee62b364':
  h264: eliminate ff_h264_set_parameter_from_sps()

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

* commit '54986d6d':
  h264: move context reinit lower down in update_thread_context()

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

* commit 'a6cd1544':
  h264: move the DPB init/uninit to init_context()/free_context()

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

* commit '9d33bab5':
  h264: drop H264Context.ouputed_poc

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

* commit '27b0e6eb':
  h264: drop needs_realloc
Merged-by: Michael Niedermayer <michaelni@gmx.at>

It now has a fixed size and is initialized only once, so there is no
point in allocating it separately.

There is no real need to handle the init case specially, everything
necessary is initialized in the reinit code as well.

It is only used to decide whether to call free_tables(), but that
function is safe to call on an uninitialized context as well.

With frame threading, it is currently only updated in the context where
the change occurs, but not in any other contexts.

It does not make sense to copy is_avc without copying this as well. This
patch should not change anything for now, but will have an effect in
later commits.

It does not logically belong in free_tables(), since it's not allocated
in alloc_tables() and its size has nothing to do with the frame size.

That function currently does two things -- reinitializing the DSP
contexts and setting low_delay based on the SPS values.

The former more appropriately belongs in h264_slice_header_init(), while
the latter only really makes sense in decode_slice_header().

The third call to ff_h264_set_parameter_from_sps(), done immediately
after parsing a new SPS, appears to serve no useful purpose, so it is
just dropped.

Also, drop now unneeded H264Context.cur_chroma_format_idc.

It uses some fields from the SPS, which is not yet set where the reinit
is called currently.

Currently, the DPB is initialized in alloc_tables() and uninitialized in
free_tables(), but those functions manage frame size-dependent
variables, so DPB management does not logically belong in there.

Since we want the init/uninit to happen exactly once per the context
lifetime, init_context()/free_context() are the proper place for this
code.

It is only set, but never used for anything.

It is not needed anymore since switching to refcounted frames.

* commit '0ac8ff61':
  avresample: Reallocate the internal buffer to the correct size
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

* commit '82de8d71':
  mpegts: Update the PSI/SI table only if the version change

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

* commit '0c69164f':
  h263: Convert function to macro

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

* commit '59dfc2b0':
  h263: Drop commented-out code and a related otherwise unused function
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'c3418201':
  jpeglsenc: Mark codec as init-thread-safe and init-cleanup
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '3919a457':
  jpeglsenc: Check memory allocations

Conflicts:
	libavcodec/jpeglsenc.c

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

* commit 'f5ba67ee':
  flacenc: Move a scratch buffer to struct used by the function

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

Fixes the corner case in which the internal buffer size
is larger than input buffer provided and resizing it
before moving the left over samples would make it write
to now unallocated memory.

Bug-Id: 825
CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

The existing check has two problems:
 1) i + count can overflow, so that the check '< 256' returns true.
 2) In the (i == 'N') case occurs a j-- so that the loop runs once more.

This can trigger the assertion 'nut->header_len[0] == 0' or cause
segmentation faults or infinite hangs.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>