Revert "lavf/concatdec: define "ffcat" and "ffconcat" extensions"

This reverts commit 6cc12353a88dfb21c4c5a38e6c83280483b0ec88.

Conflicts:
libavformat/version.h

Allowing to automatically select the concat demuxer raises
security concerns, as it allows a possibly hostile file to
access any file on the system. Guessing the format based on
the file name extension does not allow to enable the safe
mode designed to avoid it.

lavu/opt: fix weird align

lavu/opt-test: do not explicitly set default value in test_ctx

Let av_opt_set_defaults() set the value, which is simpler and more
idiomatic.

tests: add overlay rgb and yuv444 tests

Also rename overlay test to overlay_yuv420 accordingly.

mp3dec: Fix VBR bit rate parsing

When parsing the Xing/Info tag, don't set the bit rate if it's an Info tag.

When parsing the stream, don't override the bit rate if it's already set,
otherwise calculate the mean bit rate from parsed frames. This way, the bit
rate will be set correctly both for CBR and VBR streams.

Signed-off-by: Alexander Kojevnikov <alexander@kojevnikov.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

fate: add dependency for xface

Signed-off-by: Paul B Mahol <onemda@gmail.com>

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: Use check_builtin() where appropriate

Conflicts:
configure

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

Merge commit '9c7d85b3b45a77742b1e69c48ab33f9c8a2e6f35'

* commit '9c7d85b3b45a77742b1e69c48ab33f9c8a2e6f35':
  configure: Add check_builtin convenience function

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

Merge commit 'f868b24d0f280bb966e5c352028a343e45d20a02'

* commit 'f868b24d0f280bb966e5c352028a343e45d20a02':
  configure: Add sanitize_var_name convenience function

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

Merge commit '813b82b927b19532e3bc3397b972c8a27b9f6326'

* commit '813b82b927b19532e3bc3397b972c8a27b9f6326':
  configure: Fix silly typo in logging command of check_struct()
  fate: remove last incomplete frame from mpeg2-field-enc test

Conflicts:
tests/fate/video.mak
tests/ref/fate/mpeg2-field-enc

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

zmbv: stop doing colorspace conversion

Signed-off-by: Paul B Mahol <onemda@gmail.com>

doc/filters: fix short options for noise filter

Signed-off-by: Paul B Mahol <onemda@gmail.com>

configure: Use check_builtin() where appropriate

configure: Add check_builtin convenience function

configure: Add sanitize_var_name convenience function

This is useful in all the places where special characters in
variable names are manually translated to underscores.

configure: Fix silly typo in logging command of check_struct()

Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Add h264chroma dependency for mpegvideo / lowres to configure.

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

msrledec: fix output_end checks

Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

iff: fix integer overflow

Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Add h264chroma dependency for mpegvideo / lowres to configure.

Fix building for some unusual configurations.

update_stream_timings: check bitrate for being in range.

Fixes numerical overflow
Fixes Ticket2089

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

dnxhddec: return the correct number of bytes from decode_frame

Fixes Ticket2022

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

avformat: Make duration estimation from pts more robust

Ignore durations which differ significantly from the previous
Fixes Ticket2018

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

nutdec: more specific return codes for decode_syncpoint()

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

nutdec: print error on invalid/unsupported fourcc style

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

Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  buildsys: only include log2_tab per library for shared builds
  Add h264chroma dependency for cavs decoder to configure.
  Add h264qpel dependency for snow codec to configure.
  Add h264chroma dependency for vp5 and vp6 decoder to configure.

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

build: [autodetect] -> [no] in iconv help.

buildsys: only include log2_tab per library for shared builds

Fix linking failures with -all_load due to multiple log2_tabs

Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>

Add h264chroma dependency for cavs decoder to configure.

Fix building for some unusual configurations.

Add h264qpel dependency for snow codec to configure.

Fix building for some unusual configurations.

Add h264chroma dependency for vp5 and vp6 decoder to configure.

Fix building for some unusual configurations.

fate: remove last incomplete frame from mpeg2-field-enc test

compat/strtod: isspace -> av_isspace.

This should fix build after 88d55b8.

build: disable iconv by default.

It seems to break a lot on MacOS because of a mixup between multiple
iconv libraries. The issue is that the configure check link with no
particular library path (so it uses /usr/lib/libiconv.dylib where all
the symbols are defined). OTOH, the final build might link with extra
library paths, such as the ports lib directory (typically you get
-L/opt/local/lib because of an extra library such as SDL). Whatever this
option position (before or after -liconv), it will try to link with
/opt/local/lib/libiconv.dylib, and the issue is that this version has
the same symbols as the ones in /usr/lib/libiconv.dylib except that they
all start with 'lib' (libiconv_open, libiconv_close, ...). I don't plan
to try to workaround this mess, so any better solution is welcome.

doc/filters: fix degrees/radians copy/paste fail.

ffmpeg_opt: Ask for overwrite in single image2 files too

Fixes Ticket1637

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

lavfi/opencv: isgraph -> av_isgraph.

Fix build after 88d55b8.

Remove incorrect use of ctype.h functions.

As far as I can tell the code should not change behaviour
depending on locale in any of these places.

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

Deprecate deinterlaced in libavcodec.

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

ffmpeg: fix -stats -v 0

Fixes Ticket1687

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

avformat: gather aspect ratio from rv30/40 in find_stream_info

Fixes Ticket1550

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

rv34: fix aspect ratio

Fixes part of Ticket1550

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

wmadec: check nb_frames

Improves error message for Ticket968

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

Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  movenc: Do not flag secondary audio and subtitle tracks as enabled.

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

h264: put call to ff_print_debug_info2 under CONFIG_MPEGVIDEO.

The code is located in mpegvideo, and it's likely that in a minimal
config, we don't want to include debug info anyway.

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

h264: make it possible to compile without error_resilience.

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

movenc: Do not flag secondary audio and subtitle tracks as enabled.

Fixes ticket #468 and ticket #1174.

Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  rtpdec: Initialize some variables to silence compiler warnings

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

h264: add a copy of draw_horiz_band.

This makes the decoder independent of mpegvideo.

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

libxvid: cleanup on error pathes

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

libxvid: check & clear encoder_handle

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

libxvid: use av_freep() for saftey

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

libxvid: remove temporary files at the end

Fixes Ticket924

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

rtpdec: Initialize some variables to silence compiler warnings

The warnings are false positives, older gcc versions (such as 4.5)
think the variables can be used uninitialized while they in
practice can't, while newer (4.6) gets it right.

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

mjpegdec: fix endiansoup

Fixes Ticket2175

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

Avoid huge memory allocations from asf demuxer.

Fixes ticket #1888.

lavc/flacdec: Add frame CRC calculation

Fixes ticket #2266

Signed-off-by: James Almer <jamrial@gmail.com>

ffmpeg: print maxrss "-benchmark" data even on errors

Fixes Ticket2297

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

er: Fix slice threading check

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  h264: set ref_count to 0 for intra slices.

Conflicts:
libavcodec/h264.c

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

Merge commit '668e16a0dd1ff56d4beeff5c658d8a2a08dbfac8'

* commit '668e16a0dd1ff56d4beeff5c658d8a2a08dbfac8':
  h264: on reference overflow, reset the reference count to 0, not 1.

Conflicts:
libavcodec/h264.c

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

Merge commit 'e671d3ad6cd7fe1d02e9b35b889a25d8c059fce9'

* commit 'e671d3ad6cd7fe1d02e9b35b889a25d8c059fce9':
  h264: do not copy ref count/ref2frm when updating per-frame context
  flvdec: Check the return value of a malloc

Conflicts:
libavformat/flvdec.c

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

Merge commit 'c91c63b5380bf79655c09320774a022f84d76fd5'

* commit 'c91c63b5380bf79655c09320774a022f84d76fd5':
  flvdec: Don't read the VP6 header byte when setting codec type based on metadata

Conflicts:
libavformat/flvdec.c

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

h264: set ref_count to 0 for intra slices.

CC:libav-stable@libav.org

h264: on reference overflow, reset the reference count to 0, not 1.

Since decode_slice_header() returns before the reference lists are
constructed, there are zero valid references.

CC:libav-stable@libav.org

h264: do not copy ref count/ref2frm when updating per-frame context

They are filled in decode_slice_header() anyway.

v4l2: fix regression that caused ffmpeg to occasionally get stuck

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

lavd/v4l2: copy frames into normally allocated packets whenever there is just one buffer left available

This will avoid the possibility that we dequeue more buffers than we
have obtained from the v4l2 driver.

Fixes ticket #1570

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

flvdec: Check the return value of a malloc

The callers of this function can't report errors sanely. If this
one malloc fails, don't write the extradata byte, make sure we
try to malloc it the next time we're called instead, and make sure
we still consume the input data byte.

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>

flvdec: Don't read the VP6 header byte when setting codec type based on metadata

This header byte is only present when actually reading a VP6 frame,
not when reading the codec type field in the metadata. This
potential bug has been present since 5b54a90c.

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>

ffplay: use AVFrame accessor functions

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

avcodec/utils: use AVFrame accessor functions

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

avcodec/rawdec: use AVFrame accessor functions

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

pngdec: use AVFrame accessor functions

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

gifdec: use AVFrame accessor functions

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

cpia: use AVFrame accessor functions

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

tiff: use AVFrame accessor functions

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

ac3dec: use AVFrame accessor functions

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

ffprobe: use AVFrame accessor functions

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

doc/examples/demuxing: use AVFrame accessor functions

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

avcodec: add ff_frame_get_metadatap()

This is needed for av_dict_*

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

lavc/codec_desc: add/fix .props for SGI/DPX/X-face/BRender PIX image

Signed-off-by: Paul B Mahol <onemda@gmail.com>

Handle an invalid extra mpeg2 picture header following a frame-encoded picture.

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

sgidec: use unchecked bytestream2 functions where it makes sense

Overreads can not happen as header size of 512 bytes is required.

Signed-off-by: Paul B Mahol <onemda@gmail.com>

soxr: libsoxr 0.1.1 support

Libsoxr 0.1.1 will be out very soon; no changes planned beyond what's currently in git.
It includes a couple of fixes (not affecting FFmpeg's current usage) and a minor API change (but remains ABI compatible).

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

exr: use bytestream functions in pxr24_uncompress()

Signed-off-by: Paul B Mahol <onemda@gmail.com>

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lls: Do not return from void functions

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

Merge commit '4da950c0ae224b9b8ef952dadf614be2c050023e'

* commit '4da950c0ae224b9b8ef952dadf614be2c050023e':
  lls: #ifndef --> #if in FF_API_ version guard

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

Merge commit 'e8c52271c45ec27d783e74238dcfad0c2008731c'

* commit 'e8c52271c45ec27d783e74238dcfad0c2008731c':
  Revert "Move H264/QPEL specific asm from dsputil.asm to h264_qpel_*.asm."

Conflicts:
libavcodec/x86/dsputil.asm

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

Merge commit '399663be9d4a839b894c48a21b62926eb8497d72'

* commit '399663be9d4a839b894c48a21b62926eb8497d72':
  lls: mark max_order as unsigned short

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

Merge commit '9d4da474f5f40b019cb4cb931c8499deee586174'

* commit '9d4da474f5f40b019cb4cb931c8499deee586174':
  lls: move to the private namespace

Conflicts:
libavutil/version.h

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

Merge commit '7ac6d2423e9bf0f40c67be9a0ca7600b516b0282'

* commit '7ac6d2423e9bf0f40c67be9a0ca7600b516b0282':
  lls: K&R formatting cosmetics

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

Merge commit 'df0229a7caa124dcfb84c34b48d316744c467311'

* commit 'df0229a7caa124dcfb84c34b48d316744c467311':
  avconv: Apply codec options to streams that are copied as well

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

Merge commit 'cb6f8245aed2c26fe95c30cd68c45983277a945a'

* commit 'cb6f8245aed2c26fe95c30cd68c45983277a945a':
  cmdutils: Allow calling filter_codec_opts without a set encoder
  pnm: Use av_pix_fmt_desc_get instead of accessing the array directly

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

lls: Do not return from void functions

lls: #ifndef --> #if in FF_API_ version guard

ffmpeg: fix variable name in psnr printing code

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

libvpxenc: dont redundantly zero fields, the whole context is zeroed on init

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

libvpxenc: add psnr support

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

Revert "Move H264/QPEL specific asm from dsputil.asm to h264_qpel_*.asm."

This reverts commit f90ff772e7e35b4923c2de429d1fab9f2569b568.

The code should be put back in h264_qpel_8bit.asm, but unfortunately
it is unconditionally used from dsputil_mmx.c since 71155d7.