h264: Remove some commented-out, broken cruft
avutil/opt: try to fix the case where src==dst in av_opt_copy()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
lavu/eval: add clip function
lavfi/drawtext: add expansion function eif()

It evaluates expression and outputs it as integer value, using specified
format.

Address trac ticket #3699.

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
h264: K&R formatting cosmetics

Signed-off-by: Diego Biurrun <diego@biurrun.de>
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
avpacket: Check for and return errors in ff_interleave_add_packet()

Signed-off-by: Diego Biurrun <diego@biurrun.de>
x86: dsputil: Coalesce all init files

This makes the init files match the structure of the dsputil split.
lavfi/drawtext: add fontcolor_expr option

Allow to dynamically evaluate the font color.

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
doc/filters/drawtext: simplify example, use clip() eval function
Merge commit 'a11ef610eec5241e226efbd1c5bb5eb45c88d2c2'

* commit 'a11ef610eec5241e226efbd1c5bb5eb45c88d2c2':
  h264: Remove some commented-out, broken cruft

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit '2db953f84671997e936f91140ffb5143c1537844'

* commit '2db953f84671997e936f91140ffb5143c1537844':
  h264: K&R formatting cosmetics

Conflicts:
	libavcodec/h264.c
	libavcodec/h264_direct.c
	libavcodec/h264_slice.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit '324ff59444ff5470bb325ff1e2be7c4b054fc944'

* commit '324ff59444ff5470bb325ff1e2be7c4b054fc944':
  avpacket: Check for and return errors in ff_interleave_add_packet()

Conflicts:
	libavformat/audiointerleave.c
	libavformat/internal.h
	libavformat/mux.c

See: 4d7c71c36467331f1e0c0f17af9f371d33308a9c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
avformat/dv: implement fallback in dv_extract_pack()

Fixes Ticket2340
Fixes Ticket2341

Based-on mail from Dave Rice <dave@dericed.com>
Tested-by: Dave Rice <dave@dericed.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
configure: Assume runtime cpu detection on arm on --target-os=android as well

Signed-off-by: Martin Storsjö <martin@martin.st>
lavf/segment: only use reference frames for computing the segment end time

This avoids a systematic overestimate of the segments duration when there
are several streams.

Fix trac ticket #3724.
lavf/segment: show incoming packet duration in debug message
lavf/segment: fix weird indent
lavf/segment: set segment end time when the first packet arrives

Avoid negative durations in case there is a single packet in the current
segment, since in that case the end time is still set to the previous
segment end time.
ffserver: use av_mallocz_array()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avcodec/resample2: Use av_malloc(z)_array()

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