Merge commit 'f52b8717617e94da90a45afdfff23e94f9ecf35c'

* commit 'f52b8717617e94da90a45afdfff23e94f9ecf35c':
  celp_filters: don't use filter lenght as loop bound

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

Merge commit 'c442190a6bfd8036f6c32b78e1e96ff3b830f8f0'

* commit 'c442190a6bfd8036f6c32b78e1e96ff3b830f8f0':
  error_resilience: initialize prev_* variables

Note, these variables are not used without initialization prior
to the change

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

Merge commit '240b22afe14ef477da1b439b9ed7bca6cc7d6c26'

* commit '240b22afe14ef477da1b439b9ed7bca6cc7d6c26':
  motion_est: remove dead code

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

Merge commit '351d0f8b7a6ecce411ae75fb3511573c34317218'

* commit '351d0f8b7a6ecce411ae75fb3511573c34317218':
  get_bits: remove unused assignment

Conflicts:
libavcodec/get_bits.h

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

ffmpeg_opt: store canvas size in decoder context

Fixes canvas size
Fixes Ticket4074

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

avformat/mpegts: fix iteration count in add_pid_to_pmt()

Fixes accessing uninitialized memory

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

avfilter/af_aresample: Limit data per inserted packet

This avoids creating unwieldy large packets, which is allowed but
does not seem to be a good idea

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

avfilter/af_aresample: split flushing code out

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

swresample: Fix swr_drop_output so it does not flush the buffers

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

id3v2: prefer TDRC for date over TDRL.

TDRL is what we used as a replacement of TYER, and, according to
http://id3.org/id3v2.4.0-changes :
    TYER - Year
        This frame is replaced by the TDRC frame, 'Recording time'
        [F:4.2.5].
So change TDRL usages to TDRC.

Fixes ticket #3694

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

avformat/mpegts: also print PMT version in av_dlog()

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

avformat/rtmpproto: Do not fail when the length cannot be determined for live streams

Fixes Ticket4071

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

avformat/mpegts: Continue parsing PMTs during duration estimation

This way if we by chance run into a valid PMT we have a more complete
set of streams, also do not reset streams in case we run into a worse
PMT

Fixes Ticket4046

alternatively Ticket4046 could be closed as invalid or wontfix as it contains
some PMTs which lack the 2 subtitle streams

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

avformat/utils: Leave skip_clear enabled until after estimate_timings()

Should make no difference but will be needed for subsequent commits

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

avformat/mpegts: Do not add pid if its already there with add_pid_to_pmt()

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

avcodec/libwebpenc: add quality option

previously quality could only be set through qscale/global_quality but the scale
was inverted. Using a separate option avoids the confusion from qscale working
backward.

Reviewed-by: Benoit Fouet <benoit.fouet@free.fr>
Reviewed-by: Clément Bœsch <u@pkh.me>
Reviewed-by: Nicolas George <george@nsup.org>
Reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

doc: Better documentation for the bitexact flag

Reviewed-by: Benoit Fouet <benoit.fouet@free.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

celp_filters: don't use filter lenght as loop bound

CC: libav-stable@libav.org
Bug-Id: CID 717906 / CID 717907 / CID 717916 /
        CID 717917 / CID 717919 / CID 732259

error_resilience: initialize prev_* variables

CC: libav-stable@libav.org
Bug-Id: CID 732293 / CID 732294

avfilter/vf_idet: use exp2()

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

avfilter/vf_idet: use av_rescale()

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

avfilter/vf_idet: fix rounding of av_dict_set_fxp()

fixes the remainder overflowing beyond .999

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

avfilter/vf_idet: add a "half_life" option for statistics

This can be useful for videos in which the interlacing pattern changes.

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

motion_est: remove dead code

mb_type is initialized to 0 and never updated before the check.

Bug-Id: CID 1238782

get_bits: remove unused assignment

Bug-Id: CID 1238816

configure: add xcb cflags and extralibs to cflags and extralibs.

Replace xcb_event by xcb, as the former is no more used and the latter
is needed on configurations where only xcb is available, and not
libxcb_shm and/or libxcb_xfixes.

Signed-off-by: Benoit Fouet <benoit.fouet@free.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/options_table fix min of audio channels and sample rate

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

Merge commit '2f221b6a9365aa400061e16266f2d1242f7169f8'

* commit '2f221b6a9365aa400061e16266f2d1242f7169f8':
  movenc: Define the flag bits using shifts instead of as decimal numbers

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

movenc: Define the flag bits using shifts instead of as decimal numbers

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

lavf/flvenc: fail in case the muxed packet is too big

Avoid the creation of files which cannot be successfully decoded by
ffmpeg, for example generated with:
ffmpeg -f lavfi -i sine -af "aselect='not(between(t,100,500))',aresample=min_comp=0.001:min_hard_comp=0.100000" -acodec pcm_s16le -t 1000 -y out_audio.flv

README: fix 2 typo in the doc/examples sentence

ffserver_config: add fixme on buffer_aggressivity/eq deprecation

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>

ffserver_config: simplify some if true conditions

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>

ffserver_config: fix line lengths

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>

Silence warnings for fic files with zero-sized cursors.

Fixes ticket #4072.

lavf/movenc: Write G.726 bitrate to make the files decodable.

Fixes ticket #4069.

ffserver_config: improve AVOption handing

AVOption are checked right after found in config file.
It allows to report exact line in config file.

Options provided more than once are threated as errors.

It also fixes flag options handing.
Flags may occur more than once in config file.

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

ffserver_config: improve error handling

Replace atoi with more advanced parsing routine.
Set maximum port value to 65535 (not 65536).
Other checks.

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

avformat/img2enc: Use localtime_r() for thread saftey

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

avformat/sbgdec: Use localtime_r() for thread saftey

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

avformat/wavenc: Use localtime_r() for thread saftey

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

avformat/segment: use time_internal.h, simplify code

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

avcodec/jacosubdec: use time_internal.h, simplify code

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

avfilter/vf_drawtext: use gm_time_r() for thread saftey

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

avformat/matroskadec: use gmtime_r() for thread saftey

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

avformat/webpenc: removed unused variable

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

avcodec/h264_slice: Clear table pointers to avoid stale pointers

Might fix Ticket3889

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

avformat/img2enc: remove webp extension as we have a dedicated webp muxer

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

ffserver_config: dont pass pointer to enum as pointer to int

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

avcodec/libwebpenc: support "P" frames in webp animations

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

avformat: add webp muxer

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

avformat/assenc: Add ignore_gaps option

Signed-off-by: Clément Bœsch <u@pkh.me>

avfilter/idet: add current frame classification to metadata

Fixes ticket 3832

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

avfilter/idet: add metadata to "current" frame instead of "next" frame

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

avformat/rtpdec_h261: code aligned to the HEVC code

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

mpeg4vdpau: Fix priv data size.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>

avcodec/pthread_slice: Use av_freep() to avoid leaving stale pointers in memory

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

avcodec/pthread_frame: Simplify code by using av_reallocp_array()

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

avcodec/parser: use av_freep() to avoid leaving stale pointers in memory

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

ffserver_config: fix compilation warning

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

ffserver_config: postpone codec context creation

So far AVCodecContext was created without codec specified.
This causes internal data to not be initialized to defaults.

This commit postpone context creation until all information is gathered.

Partially fixes #1275

lavd/alsa: implement get_device_list callbacks

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

doc/formats: document libavformats bitexact flag

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

doc: document -dump_separator

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

avcodec/mjpegenc: use av_freep(), avoid leaving stale pointers in memory

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

configure: fix escaping in xcb cflags / libs

Fixes build with open64

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

Merge commit 'aae6b3b918b4133b8cc2d1631196c1d406d0351a'

* commit 'aae6b3b918b4133b8cc2d1631196c1d406d0351a':
  movenc: Don't write any iso brands in ismv files

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

Merge commit 'c55d1d382cd41345a79782ace41f9b43f45dca9a'

* commit 'c55d1d382cd41345a79782ace41f9b43f45dca9a':
  movenc: Don't write any tfdt atom for ismv files

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

Merge commit '00c67fe1d0bc7c2ce49daac9c80ea39d5a663b73'

* commit '00c67fe1d0bc7c2ce49daac9c80ea39d5a663b73':
  movenc: Write a 0 duration in mdhd and tkhd for an empty initial moov

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

Merge commit 'cf589faa5b7aed3bb38e08dcd00bd951e69686d1'

* commit 'cf589faa5b7aed3bb38e08dcd00bd951e69686d1':
  movenc: Add a flag for using default-base-is-moof in tfhd atoms

Conflicts:
libavformat/version.h

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

doc: Add documentation for the whitelist options

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

avcodec/h264_parser: Use av_freep() to avoid leaving stale pointers

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

avcodec/cngdec: Use av_freep() to avoid leaving stale pointers in memory

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

avcodec/crystalhd: use av_freep() to avoid stale pointers

this leaves some av_free() where the pointer is overwritten
shortly later

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

avcodec/dvbsubdec: use av_freep() to avoid leaving stale pointers

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

avcodec/dvbsubdec: merge declaration and init

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

movenc: Don't write any iso brands in ismv files

We deviate slightly from the iso specs for these files.

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

movenc: Don't write any tfdt atom for ismv files

The tfdt atom shouldn't be needed in those cases, we already
write tfxd atoms for ismv anyway, which is roughly equivalent.

This avoids having to declare the iso6 brand for ismv files.

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

movenc: Write a 0 duration in mdhd and tkhd for an empty initial moov

ISO/IEC 14496-12:2012/Cor 1:2013 is explicit about how this should be
handled. All zeros doesn't mean that the full file has got a zero
duration, only that the track samples described within the initial moov
have got zero duration. An all ones duration means an indeterminate
duration.

Keep writing a duration consisting of all ones for the ISM mode -
older windows media player versions won't play a file if this is
zero. (Newer windows media player versions play either version fine.)

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

avcodec/dxtory: use unaligned copy for unaligned addresses

Fixes undefined behavior
Fixes: asan_heap-oob_112c6b3_13_012.avi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/svq1dec: zero terminate embedded message before printing

Fixes out of array access
Fixes: asan_stack-oob_49b1e5_10_009.mov
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/cook: check that the subpacket sizes fit in block_align

Fixes out of array read
Fixes: asan_heap-oob_fb5c50_19_018.rmvb
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avdevice/xcbgrab: Fix offset support

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

ffprobe.xsd: add packets_and_frames element definition

This allows validation of ffprobe XML output if -show_packets and
-show_frames are both set.

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>

Fix compilation of xcbgrab if xcb/shape.h is not available.

Old versions of libxcb do not provide xcb_shape_rectangles().
The issue can be fixed differently but this small change fixes
some fate platforms and a user reported compilation problem.

Reported and tested by trac user kevmitch.
Fixes ticket #4067.

Fix xcbgrab build if shm is not available.

Fix disabling libxcb-shm and libxcb-xfixes.

Merge commit '600d5ee6b12bad144756b0772319bb04796bc528'

* commit '600d5ee6b12bad144756b0772319bb04796bc528':
  movenc: Signal iso6 in compatible_brands when using tfdt

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

Merge commit 'a9911a1b2df37ca808e06dc30627215f4ec9a9e4'

* commit 'a9911a1b2df37ca808e06dc30627215f4ec9a9e4':
  doc: Document the omit_tfhd_offset flag to the mp4 muxer

Conflicts:
doc/muxers.texi

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

Merge commit '1e0b81abe86dc09dd34d60d57f92de5f12d65818'

* commit '1e0b81abe86dc09dd34d60d57f92de5f12d65818':
  movenc: Use a local variable consistently

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

Merge commit 'b2b79eca6fae2466a53c5daa163a37e2474364fc'

* commit 'b2b79eca6fae2466a53c5daa163a37e2474364fc':
  movenc: Don't check the custom IO flag when using faststart

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

Merge commit '573b1de2d7f1db71030f91ecdded7d0bc071f6b6'

* commit '573b1de2d7f1db71030f91ecdded7d0bc071f6b6':
  movenc: Don't use track_id to decide which track is the first in a moof

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

avcodec/g2meet: check tile dimensions to avoid integer overflow

Fixes out of array access
Fixes: asan_heap-oob_12a55d3_30_029.wmv
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

lavc/utils: Make pix_fmt desc pointer const.

Fixes an "initialization discards qualifiers from pointer target type" warning.

Autodetect libxcb.

mxfenc: fix indentation after last commit

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

Merge commit '84bf64d3598c98a748e609195358ea04b0cfd140'

* commit '84bf64d3598c98a748e609195358ea04b0cfd140':
  bethsoftvid: simplify return handling

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

Merge commit 'e9ba3098319f78c91470c05da988d865491852c5'

* commit 'e9ba3098319f78c91470c05da988d865491852c5':
  assdec: check av_new_packet return value

Conflicts:
libavformat/assdec.c

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

movenc: Add a flag for using default-base-is-moof in tfhd atoms

Similarly to the omit_tfhd_offset flag added in e7bf085b, this
avoids writing absolute byte positions to the file, making them
more easily streamable.

This is a new feature from 14496-12:2012, so application support
isn't necessarily too widespread yet (support for it in libav was
added in 20f95f21f in July 2014).

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

movenc: Signal iso6 in compatible_brands when using tfdt

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