fate: add/update reference files for 440 addition.

swscale: add yuv440p10/12 pixfmts.

lavc: add yuv440p10/12 formats to aligned pixfmt list.

lavu: add yuv440p10/12 pixfmts.

dirac: use and forward error codes

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

tools/cws2fws: Use a similar implementation in dbgprintf() as in ff_dlog()

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

avcodec/vp8: Suppress empty body warnings

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

avutil/internal: Suppress empty body warning from emms_c()

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

lavd/xcbgrab: fix comparison with screen size.

Signed-off-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

OS/2:Makedef.cmd cleanup

Remove PROTMODE as it doesn't make sense for DLLs. Also fixes a warning with the OpenWatcom linker
Export symbols as names rather then ordinals for better compatibility for minor releases.

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

avcodec/diracdec: Fix types and wraparounds in dirac_decode_picture_header()

previously various variables had a too small type to support the required 32bit unsigned
range allowed from the spec

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

diracdec: check if reference could not be allocated

s->ref_pics[i] is later used as ref argument of interpolate_refplane,
where it is dereferenced.

If it is NULL, it causes a segmentation fault.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

diracdec: avoid overflow of bytes*8 in decode_lowdelay

If bytes is large enough, bytes*8 can overflow and become negative.

In that case 'bufsize -= bytes*8' causes bufsize to increase instead of
decrease.

This leads to a segmentation fault.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '3735b5c616770429572f86aabdaec39c6ebb8818'

* commit '3735b5c616770429572f86aabdaec39c6ebb8818':
  Revert "lavfi: always check av_expr_parse_and_eval() return value"

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

lavf/riff: Add MultiScope II fourcc MSC2 as MJPEG.

Merge commit '60f1cc4a1ffcbf24acbb543988ceeaec76b70818'

* commit '60f1cc4a1ffcbf24acbb543988ceeaec76b70818':
  alsdec: only adapt order for positive max_order

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

Merge commit '94bb1ce882a12b6d7a1fa32715a68121b39ee838'

* commit '94bb1ce882a12b6d7a1fa32715a68121b39ee838':
  alsdec: check sample pointer range in revert_channel_correlation

Conflicts:
libavcodec/alsdec.c

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

Merge commit '110f7f35fb615b97d983b1c6c6a714fddd28bcbe'

* commit '110f7f35fb615b97d983b1c6c6a714fddd28bcbe':
  aacpsy: correct calculation of minath in psy_3gpp_init

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

Merge commit 'e191aaca44b986816695e3b7ecfae64697fd6631'

* commit 'e191aaca44b986816695e3b7ecfae64697fd6631':
  alsdec: limit avctx->bits_per_raw_sample to 32

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

Merge commit '8fc8024ea56e814cd257d5fe27b21a865080782f'

* commit '8fc8024ea56e814cd257d5fe27b21a865080782f':
  aasc: return correct buffer size from aasc_decode_frame

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

avcodec/diracdec: Move buf[] read after size check

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

diracdec: prevent overflow in data_unit_size check

buf_idx + data_unit_size can overflow, causing the '> buf_size' check to
wrongly fail.

This causes a segmentation fault.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

vp9: error out if chroma subsampling changes between frames.

This can happen after an intra-only frame. For reference, see:
https://groups.google.com/a/webmproject.org/forum/#!msg/webm-discuss/zaoTxREZjq8/v5Enht87AhcJ

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

Revert "lavfi: always check av_expr_parse_and_eval() return value"

This reverts commit 63be97ec403023fb664798432acedaf6e6922527.

All those calls were unchecked on purpose, as explained in the comments
in the code.

alsdec: only adapt order for positive max_order

For max_order = 0 the clipping range is invalid. (amin = 2, amax = 1)

CC: libav-stable@libav.org
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>

alsdec: check sample pointer range in revert_channel_correlation

Also change the type of begin, end and smp to ptrdiff_t to make the
comparison well-defined.

CC: libav-stable@libav.org
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>

avformat/matroskaenc: Use avoid_negative_ts_use_pts if no stream writes dts

This reduces the number of cases where timestamps need to be shifted

Fixes Ticket4487

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

avformat/mux: Add avoid_negative_ts_use_pts

This allows using pts instead of dts for negative TS avoidance

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

cmdutils: Add libm.h for round()

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

aacpsy: correct calculation of minath in psy_3gpp_init

The minimum of the ath(x, ATH_ADD) function depends on ATH_ADD.
This patch uses the first order approximation to determine it.

For ATH_ADD = 4 this results in the value at 3407.06812 (-5.24241638)
not the one at 3410 (-5.24237967).

CC: libav-stabl@libav.org
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>

alsdec: limit avctx->bits_per_raw_sample to 32

avctx->bits_per_raw_sample is used in get_sbits_long, which only
supports up to 32 bits.

CC: libav-stable@libav.org
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>

aasc: return correct buffer size from aasc_decode_frame

CC: libav-stable@libav.org
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>

cmdutils: move get_rotation() up in the file

Fixes compilation of fftools without libavdevice

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

avfilter/Makefile: add missing lavfutils.c dependency to cover_rect and find_rect filters

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

avcodec/mpeg12dec: use the correct dimensions for checking SAR

Fixes Ticket4533

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

avcodec/x86/deinterlace: use INIT_MMX like other asm code does too

avformat/avidec: print a warning for negative sample_size

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

avidec: avoid infinite loop due to negative ast->sample_size

If max in clean_index is set to a negative ast->sample_size, the
following loop never ends:
        while (max < 1024)
            max += max;

Thus set ast->sample_size to 0 if it would otherwise be negative.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

vp9: add profile names

Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>

avfilter/vf_cover_rect: clip rectangle if it is partly outside the input

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

avidec: check for valid bit_rate range

If bit_rate is negative, it can trigger an av_assert2 in av_rescale_rnd.

Since av_rescale returns int64_t, but st->codec_bit_rate is int, it can
also overflow into a negative value.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  lavfi/cropdetect: Fix cropdetect for > 8 bit input.
  lavf/apngenc: Fix png remuxing by using default extension apng.
  lavf/mxfenc: Write correct interlaced flag when muxing dnxhd.

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

lavfi/cropdetect: Fix cropdetect for > 8 bit input.

lavf/apngenc: Fix png remuxing by using default extension apng.

lavf/mxfenc: Write correct interlaced flag when muxing dnxhd.

Reported and early patch version tested by forum user gridtank.
Reviewed-by: Tomas Härdin

cmdutils: Ask for a sample in case a odd rotation angle is encountered

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

avformat/matroskadec: Use tracks[k]->stream instead of s->streams[k]

The later is not correct

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

matroskadec: check s->streams[k] before using it

This fixes a segmentation fault.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/ffv1dec: Check chroma shift parameters

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

avcodec/ffv1dec: More completely check micro_version

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

avcodec/ffv1dec: Check quant table symbols more completely

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

matroskadec: use uint64_t instead of int for index_scale

index_scale is set to matroska->time_scale of type uint64_t.

When index_scale is int, the assignment can overflow and e.g. result
in index_scale = 0. This causes a floating point exception due to the
division by index_scale.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

ffmpeg_filter: use get_rotation()

This unifies the rotation extraction code between ffplay and ffmpeg

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

ffplay&cmdutils:Factor get_rotation() code out

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

avcodec/ccaption_dec: correcting line breaks in cc

Signed-off-by: Anshul Maheshwari <er.anshul.maheshwari@gmail.com>
Reviewed-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

ffplay: unify displaymatrix based rotation code

Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

pngdec: don't use AV_PIX_FMT_MONOBLACK for apng

AV_PIX_FMT_MONOBLACK has the AV_PIX_FMT_FLAG_BITSTREAM flag, i.e.
linesize can be smaller than width.

Since x_offset is only check against the width, this can lead to
x_offset * bpp >= image_linesize.

In this case ptr could be set to a position outside the image_buf in
png_handle_row, leading to memory corruption and thus crashes.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

pngdec: return correct error code from decode_frame_common

During the loop ret can get changed. Since it is not set on all failure
paths, decode_frame_common can return 0 even though an error occurred.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

pngdec: check s->last_picture.f->data[0] before using it

This check was removed in commit 08aec6f6, but
s->last_picture.f->data[0] is still used in handle_p_frame_apng
unconditionally.

This fixes a segmentation fault.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/wavpack: Check L/R values before use to avoid harmless integer overflow and undefined behavior in fate

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

avutil/opt: Avoid division by 0

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

avfilter/avf_showcqt: optimize gamma calculation

benchmark (on intel core2 duo, gcc 4.9.1)
input samples duration 00:03:39.59
command: time -p ffmpeg -f f32le -ac 2 -ar 44100 -i input.pcm \
         -filter_complex showcqt=fullhd=0:gamma=$gamma \
         -f rawvideo -y /dev/null
gamma  previous  modified
  1    48.49 s   45.38 s
  2    49.33 s   48.11 s
  3    80.86 s   59.80 s
  4    80.84 s   51.25 s
  5    80.75 s   61.06 s
  6    80.93 s   61.80 s
  7    80.03 s   61.56 s

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

avcodec/nvenc: Make pix_fmts_nvenc const

Reviewed-by: Timo Rothenpieler <timo@rothenpieler.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

ffv1dec: plane_index is 1 in case of version 4 gray+alpha.

Since version 4, plane_index for the alpha plane is 1 in the case chroma_planes is 0.

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

LICENSE.md: add *_rect filters

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

configure: prepend avfilter_deps for *_rect filters

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

Merge commit '3edeb7749e4276c78ad57307b8c3b32dd476d1da'

* commit '3edeb7749e4276c78ad57307b8c3b32dd476d1da':
  configure: Allow log2 with MSVC 2013 onwards.

Conflicts:
configure

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

Merge commit '863ee06809b215895ee20cbc557eeceb904cf770'

* commit '863ee06809b215895ee20cbc557eeceb904cf770':
  configure: Use the right local variable in the MSVC and ICL probes

Conflicts:
configure

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

Merge commit '709e1c91ea7a5bbf2b9a104642572ca7616b224f'

* commit '709e1c91ea7a5bbf2b9a104642572ca7616b224f':
  avprobe: Print the display matrix from per-stream sidedata

Conflicts:
avprobe.c

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

ffprobe: support printing AVStream and AVPacket side data

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

ffprobe: Add Support to print information about AV_FRAME_DATA_DISPLAYMATRIX

Idea from 709e1c91ea7a5bbf2b9a104642572ca7616b224f by Martin Storsjö
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

ffprobe: add writer_print_integers() to allow printing formated 1d and 2d arrays of integers

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

Merge commit '3080b0497ddf8549d86ee99b79ac0c15f44ee382'

* commit '3080b0497ddf8549d86ee99b79ac0c15f44ee382':
  avprobe: Support writing arrays of integers without keys

Conflicts:
avprobe.c

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

ffmpeg_opt: remove rotate metadata in case of autorotate

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

Merge commit '16302246b1fcb7ad4e6f7bd31c49956a455336d2'

* commit '16302246b1fcb7ad4e6f7bd31c49956a455336d2':
  avconv: Add an option for automatically rotating video according to display matrix

Conflicts:
Changelog
ffmpeg_opt.c

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

Merge commit 'e2d50fc2f5f3600e13055acf1a10fec35e941f37'

* commit 'e2d50fc2f5f3600e13055acf1a10fec35e941f37':
  avplay: Add support for rotated video

Conflicts:
configure
doc/ffplay.texi
ffplay.c

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

Merge commit '21180b73239c6360aa28496d4879713b7ba4a8e5'

* commit '21180b73239c6360aa28496d4879713b7ba4a8e5':
  avplay: Factorize code for adding filters to the filter pipeline

Conflicts:
ffplay.c

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

configure: add forgotten avcodec/avformat deps for find/cover_rect

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

avfilter: Add cover_rect filter

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

avfilter: add find_rect filter

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

configure: Allow log2 with MSVC 2013 onwards.

Only MSVC 2010 in x64 mode, in the static msvcrt, had a
stray log2 function (which wasn't available in the headers).

MSVC 2013 has got a proper log2 function though.

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

configure: Use the right local variable in the MSVC and ICL probes

$cc is the compiler requested as main target compiler, while $_cc
is the actual tool tested in the probe function right now (which
can also be e.g. the host compiler).

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

avprobe: Print the display matrix from per-stream sidedata

This is printed in a separate subgroup "displaymatrix" inside a
new group named "sidedata". The subgroup has got two values,
"rotation" (which is the parsed rotation from the matrix) and
"matrix" containing the full actual values.

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

avprobe: Support writing arrays of integers without keys

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

avconv: Add an option for automatically rotating video according to display matrix

The option is enabled by default, but can be disabled.

If this is enabled, such side data isn't copied into the output stream
(except when doing stream copy).

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

avplay: Add support for rotated video

This is enabled by default, but can be disbled via the -noautorotate
option.

Based on a patch by Clément Bœsch.

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

avplay: Factorize code for adding filters to the filter pipeline

Significantly based on a patch by Clément Bœsch.

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

libavcodec/svq3: clarify unknown_flag by renaming to has_watermark

The name is based on how the field is used in the code

Reviewed-by: compn <tempn@mi.rr.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avfilter/vf_libopencv: Make ocv_filter_entries const

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

avutil/cast5: Make iv array static

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

avutil/cast5: Mark key_bits as const

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

avcodec/x86/dct-test: Use uint8_t for idct_simple_mmx_perm

The table contains no element outside the unsigned 8bit range

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

avcodec/x86/dct-test: Make static table const

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

avformat/matroskadec: Mark static tables as const

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

lavf/http: support HTTPS when listening

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

avcodec/svq3: Print unknown fields at debug level

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

Merge remote-tracking branch 'rbultje/vp9-profile1-wip'

* rbultje/vp9-profile1-wip:
  vp9: add fate test for 422.
  vp9: copy bug in libvpx for 4:2:2 chroma bs=8x4/4x4 prediction.
  vp9: add yuv440 fate test.
  vp9: fix mask_edges and filter_plane_rows/cols() for 440.
  vp9: more specifically specify mask destination to mask_edges().
  vp9: add fate test for profile 1 444.
  vp9: don't create special u/v filter masks for 444.
  vp9: merge uv loopfilter code into generic filter_plane_rows/cols().
  vp9: split out loopfilter luma rows/cols functions from loopfilter_sb().
  vp9: invert order of two conditions.
  vp9: use correct chroma subsampling for profile 1 inter block recon.
  vp9: use correct chroma subsampling for profile 1 intra block recon.
  vp9: take chroma subsampling into account when walking the block tree.
  vp9: support non-420 chroma subsampling for profile 1 token decoding.
  vp9: increase buffer sizes for non-420 chroma subsamplings.
  vp9: profile 1 header decoding.

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

Merge commit '3ecb82dd4110108244373f007710df4c2ae572b6'

* commit '3ecb82dd4110108244373f007710df4c2ae572b6':
  dnxhddec: Fix pixel format change

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

Merge commit '6503cbf842a026faec517eb980551089168c7d8a'

* commit '6503cbf842a026faec517eb980551089168c7d8a':
  ffv1enc: Add const attribute to input frame

Conflicts:
libavcodec/ffv1.h

no change, the changed field does not exist in FFmpeg

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

dnxhddec: Fix pixel format change

Regression introduced in 598f7d046cbf306706623210c5baafa3b7cd1df3.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>