* commit '48183b3a':
  rtpdec_h264: Generalize parse_sprop_parameter_sets
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'a982c5d7':
  tests: drop bc dependency

Conflicts:
	tests/fate-run.sh

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

* commit 'a06b0b12':
  h264: initialize H264Context.avctx in init_thread_copy
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '0dea4c77':
  h264: only ref cur_pic in update_thread_context if it is initialized

Conflicts:
	libavcodec/h264_slice.c

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

* commit '9abc80f1':
  libavcodec: Make use of av_clip functions

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

* commit '76ce9bd8':
  libavutil: Add ARM av_clip_intp2_arm
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'bf07d813':
  libavutil: Add av_clip_intp2
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Don't write directly into an AVCodecContext, write into given
pointers.
Signed-off-by: Martin Storsjö <martin@martin.st>

We already have a dependency on awk and bc is sometimes not found in the
base system.
Signed-off-by: Martin Storsjö <martin@martin.st>

This prevents using a wrong (first thread's) AVCodecContext if decoding
a frame in the first pass over all threads fails.

It may be empty if the previous thread's decode call did not contain a
valid frame.

This improves the cleanup, dependency generation and DBG command issuing.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit '3fe26bb6':
  hlsenc: write playlist into a temp file and replace the original atomically

Conflicts:
	libavformat/hlsenc.c

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

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

Reviewed-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'ff48ae94':
  hlsenc: remove the AVIOContext for the playlist from the muxer context

Conflicts:
	libavformat/hlsenc.c

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

Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

add ARM code for implementing av_clip_intp2 using the ssat instruction

on Cortex-A8, av_clip_intp2_arm() is faster than av_clip_intp2_c() and
the generic av_clip(), about -19%
Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

there already is a function, av_clip_uintp2() that clips a signed integer
to an unsigned power-of-two range, i.e. 0,2^p-1

this patch adds a function av_clip_intp2() that clips a signed integer
to a signed power-of-two range, i.e. -(2^p),(2^p-1)

the new function can be used as a special case for av_clip(), e.g.
av_clip(x, -8192, 8191) can be rewritten as av_clip_intp2(x, 13)

there are ARM instructions, usat and ssat resp., which map nicely to these
functions (see next patch)
Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

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

ffm encoder fails when codec is not found.
It may happen when stream is being copied.
This commit allows to store such stream and provides
backward compatibility with version prior 2.5 release.

fixes #4266
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>

Signed-off-by: Martin Storsjö <martin@martin.st>

Its only used in one function, having it in the context serves no purpose.
Signed-off-by: Martin Storsjö <martin@martin.st>

* commit 'b8d18a94':
  libavcodec: Don't use av_cold annotation in twinvq header file
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'df0891fc':
  libavresample: Annotate AARCH64 init function with av_cold
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '46ad9ac9':
  rtpdec_h264: Move a leftover comment into h264_handle_packet_stap_a

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

* commit 'a335ed76':
  rtpdec_h264: Remove an unnecessary check
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '176903ce':
  rtpdec_h264: Return immediately on errors in h264_handle_packet_stap_a
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'bb8c6ac8':
  rtpdec_h264: Make a parameter pointer const
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '7650caf0':
  rtpdec_h264: Use av_realloc instead of av_malloc+mempcy
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '8bdbf49c':
  rtpdec_h264: Include the right header for AV_RB16
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'ba2e0790':
  rtpdec_vp8: Set the keyframe flag
Merged-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>

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

Missed this hunk in first commit
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>