* commit '6a880090':
  doc: Use the correct @subsection tag

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

* commit '4fd7e63c':
  mp3: Tweak the probe scores

Conflicts:
	libavformat/mp3dec.c

FFmpeg detects the file fine, and there is a non zero risk
that this change may lead to misdetections, thus not merged.
If someone has a mp3 file that is misdetected, please open a ticket
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '4f5906a1':
  latm: Do not give a score for a single instance

Conflicts:
	libavformat/rawdec.c

No change, the buggy case was not part of FFmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '71f29410':
  lavfi: Increase drawtext font size limits

Conflicts:
	libavfilter/vf_drawtext.c

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

Show which features external libraries enable.
Fixes ticket #4157

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

When matroska_execute_seekhead() is called, it goes through the list of
seekhead entries and attempts to read elements not read yet. When doing
this, the parser can find further SeekHead elements, and will extend the
matroska->seekhead list. This can lead to a (practically) infinite loop
with certain broken files. (Maybe it can happen even with valid files.
The demuxer doesn't seem to check correctly whether an element has
already been read.)

Fix this by ignoring elements that were added to the seekhead field
during executing seekhead entries.

This does not fix the possible situation when multiple SeekHead elements
after the file header (i.e. occur after the "before_pos" file position)
point to the same elements. These elements will probably be parsed
multiple times, likely leading to bugs.

Fixes ticket #4162.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

makeinfo would otherwise refuse to build it.

Having more than 10 consecutive frames decoded as mp3 should be
considered a clear signal that the sample is mp3 and not mpegps.
Reported-By: Florian Iragne <florian@iragne.fr>
CC: libav-stable@libav.org

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

Fix potential integer overflow
Fix CID1254944
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This is similar to the format check
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes trac ticket #4164

This is to address an error when using show_region, which would cause part of the captured area to become static.
It looks like the rectangle specifying the capture area was relative to the capture window.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes CID1257004

Bug-Id: 773
CC: libav-stable@libav.org

Raise the maximum font size to a larger value.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

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

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

We dont fail hard if its not set as the old API allowed this and our examples
did in the distant past not set it, these examples still work with the
current code and some encoders.

Based on suggestion by: funman
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This is commonly needed for debugging mis-detections
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes: misdetection of test2.mp3
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avutil/buffer: add #if USE_ATOMICS around atomics specific functions to ensure sync types arent mixed by mistake

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

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

This code only segfaults and fixing the segfault, the resulting
files are unplayable, so disable to avoid the segfault.

Better solution is welcome

See: [FFmpeg-devel] [PATCH] avcodec/libxavs: remove global header code
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This is not needed but its more proper to check the return value

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

Fixes CID1257014
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>

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

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

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

Fixes displaying docs on small-screen devices.
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Instead, use FontAwesome icons (if configured to be this way) or separate
text.
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This option allows segment filenames to be specified. Unless -hls_flags
single_file is set the filename is used as a string format with the
segment number.

Example:
ffmpeg -f lavfi -i testsrc -c:v h264 -map 0 -hls_segment_filename
bar%03d.ts foo.m3u8
Signed-off-by: Christian Suloway <csuloway@globaleagleent.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

* commit '9a738c27':
  v210enc: Add SIMD optimised 8-bit and 10-bit encoders

Conflicts:
	libavcodec/v210enc.c
	libavcodec/v210enc.h
	libavcodec/x86/Makefile
	libavcodec/x86/v210enc.asm
	libavcodec/x86/v210enc_init.c
	tests/ref/vsynth/vsynth1-v210
	tests/ref/vsynth/vsynth2-v210

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

* commit '33c827f6':
  swscale: Properly scale YUV

Conflicts:
	libswscale/swscale_unscaled.c
	tests/ref/fate/filter-pixdesc-yuv420p10be
	tests/ref/fate/filter-pixdesc-yuv420p10le
	tests/ref/fate/filter-pixdesc-yuv420p9be
	tests/ref/fate/filter-pixdesc-yuv420p9le
	tests/ref/fate/filter-pixdesc-yuva420p10be
	tests/ref/fate/filter-pixdesc-yuva420p10le
	tests/ref/fate/filter-pixdesc-yuva420p9be
	tests/ref/fate/filter-pixdesc-yuva420p9le
	tests/ref/fate/filter-pixfmts-copy
	tests/ref/fate/filter-pixfmts-null
	tests/ref/fate/filter-pixfmts-scale
	tests/ref/fate/filter-pixfmts-vflip

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

* commit '8c0a865a':
  mov: skip version and flags attributes in mov_read_chan()

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