Merge commit '144f7a561d32ae9bc657a217e2b4c6dd9a0d7df9'

* commit '144f7a561d32ae9bc657a217e2b4c6dd9a0d7df9':
  avcodec/fic: clear slice_data

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

Merge commit 'f34d3173fcfc7f3228095d509a64c4fa4b37b575'

* commit 'f34d3173fcfc7f3228095d509a64c4fa4b37b575':
  avcodec/fic: fix slice checks

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

avcodec/fic: clear slice_data

Fixes artifacts
Fixes use of freed memory

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

avcodec/fic: fix slice checks

fix integer overflows

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Merge commit '93e15a323871613fd26f1f1e317029a50b5b24ca'

* commit '93e15a323871613fd26f1f1e317029a50b5b24ca':
  fic: use correct IDCT

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

fic: use correct IDCT

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

avfilter/filtfmts: Support dynamically allocated in/outputs

Fixes crash
Fixes Ticket3468

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

avformat: Fix decoder search in find stream info

Fixes Ticket3548

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

avformat/asfenc: dont allow non interleaved packets

The muxer does not support this currently

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

avformat/pmpdec: remove cur_dts timestamp hack

It appears the demuxer works fine without it

Fixes Ticket3534

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

avcodec/x86/vp9lpf: add a comment above a bunch of SWAP.

avcodec/x86/vp9lpf: merge a few movs with other instructions.

lavf/pcm: remove redundant check

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

avcodec/arm/vc1dsp_init_neon: fix code so it compiles and passes fate-vc1

The original patch  seems to be missing a 16x16 function though

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

vc1dsp: introduce cases for 8x8 and 16x16

This allows further unrolling the DSP implementation where possible.

x86 and ARM DSP modified by simply moving the multiple calls from vc1dec
to the DSP code. Decoding improvements should only occurs because of the
compiler actually able to unroll more.

Decoding time: ~8.80s -> 8.64s (ie around 2%)

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

avcdoec/webp: use av_malloc_array()

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

avcodec/tiff: use av_malloc(z)_array()

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

avcodec/ratecontrol: use av_malloc_array()

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

avcodec/huffman: use av_malloc_array()

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

avcodec/exif: do not follow 0 offsets

Fixes exif decoding failure of 1295328_300.jpg

Reviewed-by; Thilo Borgmann <thilo.borgmann@mail.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/exif/exif_add_metadata: add support for SSHORT & SBYTE

No working testcase, this omission was just spoted when the parser apparently went out of
sync.

Reviewed-by; Thilo Borgmann <thilo.borgmann@mail.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Merge remote-tracking branch 'lukaszmluki/master'

* lukaszmluki/master:
  lavd/xv: implement repaint message
  lavd/xv: add window id param
  lavd/xv: keep aspect ratio

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

avformat/iff: extend IFF demuxer to decode DSDIFF 64-bit chunks

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '911fa05b514e1be009e00b79d7004b93717c023b'

* commit '911fa05b514e1be009e00b79d7004b93717c023b':
  mvc: Specify the pixel format for the mv-mvc* tests

Conflicts:
tests/fate/video.mak

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

mvc: Specify the pixel format for the mv-mvc* tests

Also set the RGBA pixel format correctly as the native endian format,
which is what it returns.

This fixes the tests on big endian.

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

Merge commit '6dfd99c93808d6504dd5cb1fad847d68cb179352'

* commit '6dfd99c93808d6504dd5cb1fad847d68cb179352':
  fate: add tests for SGI RLE and MVC1&2 decoders

Conflicts:
tests/fate/video.mak

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

Merge commit '55ddd700c67529ff2c6c4e976673f1341bba7a82'

* commit '55ddd700c67529ff2c6c4e976673f1341bba7a82':
  Silicon Graphics Movie demuxer

Conflicts:
Changelog
libavformat/mvdec.c
libavformat/version.h

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

Merge commit '86a0432688216562926d4aee36118f01be6d5e1b'

* commit '86a0432688216562926d4aee36118f01be6d5e1b':
  Silicon Graphics Motion Video Compressor 1 & 2 decoder

Conflicts:
Changelog
libavcodec/avcodec.h
libavcodec/mvcdec.c
libavcodec/version.h

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

Merge commit '07761294fc3f08e139e8a406ef7d5b63aaf1ecee'

* commit '07761294fc3f08e139e8a406ef7d5b63aaf1ecee':
  Silicon Graphics RLE 8-bit video decoder

Conflicts:
Changelog
doc/general.texi
libavcodec/avcodec.h
libavcodec/sgirledec.c
libavcodec/version.h

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

Merge commit '34c5a6660a9e5e3cf301691bb29d011638953dc2'

* commit '34c5a6660a9e5e3cf301691bb29d011638953dc2':
  h264: codec reinit: remove statements without effect

Conflicts:
libavcodec/h264_slice.c

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

Merge commit '6ef96292d99302a59f824713fc763f6abd3754df'

* commit '6ef96292d99302a59f824713fc763f6abd3754df':
  utils: add yvyu422 to avcodec_align_dimensions2

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

Merge commit 'd23fc8846d255e31896453136b4c77bc6d5e873f'

* commit 'd23fc8846d255e31896453136b4c77bc6d5e873f':
  filtfmts: remove unused lavf include

A include for channel_layout.h, is added otherwise compile would break

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

Merge commit '58400ac133bcfb6bf8196b4e5208bc178307739b'

* commit '58400ac133bcfb6bf8196b4e5208bc178307739b':
  lavfi: name anonymous structs

Conflicts:
libavfilter/buffersink.c
libavfilter/f_select.c
libavfilter/src_movie.c
libavfilter/vf_drawbox.c
libavfilter/vf_drawtext.c
libavfilter/vf_overlay.c
libavfilter/vf_showinfo.c
libavfilter/vf_unsharp.c

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

vp9/x86: simplify FILTER_INIT.

In the 2 FILTER_INIT usages, the source is already preloaded so that
extra complexity taken from FILTER_UPDATE is not necessary.

Also add forgotten "mask" argument in FILTER_{INIT,UPDATE} comments.

vp9/x86: clarify mixed splatb.

fate: add tests for SGI RLE and MVC1&2 decoders

Silicon Graphics Movie demuxer

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

Silicon Graphics Motion Video Compressor 1 & 2 decoder

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

Silicon Graphics RLE 8-bit video decoder

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

h264: codec reinit: remove statements without effect

avctx->coded_{height,width} will always equal h->{height,width} since
init_dimensions() does that explicitly, Size changes are detected by
changes in mb_{height,width} earlier and propagated through the
needs_reinit variable.

utils: add yvyu422 to avcodec_align_dimensions2

filtfmts: remove unused lavf include

lavfi: name anonymous structs

x86/float_dsp: remove duplicated code from vector_dmul_scalar

Use the xm# and ym# aliases as they remain in sync with m# after a SWAP.
No actual changes to the assembly.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Fix compilation with !HAVE_6REGS.
  Use MANGLE in cavsdsp.c to save two registers using gcc.

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

Merge commit '4936ef6492f640e1606c6507f2c4e495164d3974'

* commit '4936ef6492f640e1606c6507f2c4e495164d3974':
  configure: Handle armcc 5.0

Conflicts:
configure

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

configure: Handle armcc 5.0

The first line of the "armcc --vsn" output in one version is
"Product: ARM Compiler 5.04".

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

Fix compilation with !HAVE_6REGS.

Can be tested with:
$ ./configure --cc='cc -m32' --disable-optimizations --enable-pic

Use MANGLE in cavsdsp.c to save two registers using gcc.

Fixes compilation with !HAVE_6REGS.

avformat/mlv: add fate sample

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Magic Lantern Video (MLV) demuxer

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

ff_id3v2_read: add option to limit ID3 magic number search

Several chunked formats (AIFF, IFF,DSF) store ID3 metadata within an 'ID3 '
chunk tag. If such chunks are stored sequentially, it is possible for the
ID3v2 parser to confuse the chunk tag for the ID3 magic number. e.g.

[1st chunk tag ('ID3 ') | chunk size] [ID3 magic number | metadata ...]
[2nd chunk tag ('ID3 ') | chunk size] [ID3 magic number | metadata ...]

Fixes ticket #3530.

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

ff_id3v2_free_extra_meta: set the pointer pointing to extra_meta to NULL

Fixes ticket #3530.

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avformat/wavdec: enlarge probe_packets for wav

fix issue https://trac.ffmpeg.org/ticket/3550

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

fate: add DTS-ES test

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

lavd/xv: implement repaint message

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

lavd/xv: add window id param

Device is able to use existing window, that can be a
part of existing GUI - instead of newly created one.

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

lavd/xv: keep aspect ratio

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

avfilter/vf_rotate: make int*90° rotates suck less speedwise

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

avfilter/vf_rotate: fix several of by 1 errors

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

avfilter/vf_rotate: fix location of update operation

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

avfilter/vf_rotate: increase fixed point precision

This ensures int_sins output doesnt have "random" lsbs

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

Fix standalone compilation of image2_alias_pix and image2_brender_pix demuxers.

avcodec/qtrleenc: use av_mallocz_array()

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

avcodec/smacker: use av_mallocz_array()

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

avcodec/roqvideoenc: use av_malloc(z)_array()

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

mjpeg: cosmetics: indentation

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

mjpeg: Do not fail jpeg decoding on bad EXIF data.

It is not required to correctly decode the image.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

configure: Remove deprecated incompatible_fork_abi option

It's been deprecated since ffmpeg 2.0

Signed-off-by: James Almer <jamrial@gmail.com>
Analysis of the usage of the switches by: wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/snow: use av_malloc(z)_array()

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

avcodec/tta: use av_malloc(z)_array()

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

avcodec/vc1dec: use av_realloc_array()

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

avformat/dsddec: create audio stream before processing id3

This ensures stream[0] is always the audio stream (an assumption made
in dsf_read_packet).

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Do not overwrite VDPAU structures in ff_MPV_frame_start().

Fixes crashes with VDR and MPlayer as reported by irc user crow.

Merge remote-tracking branch 'lukaszmluki/master'

* lukaszmluki/master:
  lavd/pulse_audio_enc: implement pause messages
  lavd/pulse_audio_enc: implement volume messages
  lavd/avdevice: add volume messages
  lavd/pulse_audio_enc: add buffer fullness messages
  lavd/pulse_audio_enc: add nonblocking mode
  lavd/pulse_audio_enc: replace simple API with async API
  lavd/pulse_audio_enc: cosmetics
  lavd/pulse_audio_common: add context helper functions
  lavd/pulse_audio_common: rename variables and enums

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

DSD Stream File (DSF) demuxer

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

lavd/pulse_audio_enc: implement pause messages

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

lavd/pulse_audio_enc: implement volume messages

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

lavd/avdevice: add volume messages

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

lavd/pulse_audio_enc: add buffer fullness messages

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

lavd/pulse_audio_enc: add nonblocking mode

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

lavd/pulse_audio_enc: replace simple API with async API

Async API allows to use full capabilites of PulseAudio.

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

lavd/pulse_audio_enc: cosmetics

lavd/pulse_audio_common: add context helper functions

Functions allow to connect and disconnect from server.
Helpfull to implement utility functions with nested loops.

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

lavd/pulse_audio_common: rename variables and enums

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

avformat/replaygain: fix mixed declaration and statement

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

ffmpeg: fix mixed merged & split side data with the stream->packet hack

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

Merge commit '32d05934abc7427bb90380a4c1ab20a15fd7d821'

* commit '32d05934abc7427bb90380a4c1ab20a15fd7d821':
  mp3dec: decode more data from Info header

Conflicts:
libavformat/mp3dec.c

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

Merge commit '0983d48111f578e17e8c1967d25ce593fce62b63'

* commit '0983d48111f578e17e8c1967d25ce593fce62b63':
  crc: add ANSI CRC16 LE

Conflicts:
doc/APIchanges
libavutil/crc.c
libavutil/crc.h
libavutil/version.h
tests/ref/fate/crc

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

Merge commit 'fbd8e042107ec63e0ddf155588c59dcb76007641'

* commit 'fbd8e042107ec63e0ddf155588c59dcb76007641':
  mp3dec: move XING/Info and VBRI parsing into their own functions

Conflicts:
libavformat/mp3dec.c

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

Merge commit 'ae43c10e36197000de2f3cc99ea35727ce98a796'

* commit 'ae43c10e36197000de2f3cc99ea35727ce98a796':
  replaygain: allow exporting already decoded replaygain values

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

Merge commit '21d8f4da91673051ad7055cf63d989488a56368e'

* commit '21d8f4da91673051ad7055cf63d989488a56368e':
  resample: remove an unneeded context variable

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

mp3dec: decode more data from Info header

Signed-off-by: Anton Khirnov <anton@khirnov.net>

crc: add ANSI CRC16 LE

This adds the reversed byte-order version of the ANSI CRC16.

Signed-off-by: Anton Khirnov <anton@khirnov.net>

mp3dec: move XING/Info and VBRI parsing into their own functions

Signed-off-by: Anton Khirnov <anton@khirnov.net>

replaygain: allow exporting already decoded replaygain values

This adds a function to export raw replaygain values (i.e. in the (u)int32_t
form). It first checks whether AV_PKT_DATA_REPLAYGAIN side data is present, in
which case it does nothing.

Signed-off-by: Anton Khirnov <anton@khirnov.net>

resample: remove an unneeded context variable

Write sample_aspect_ratio to asf files.

Fixes ticket #3528.

Only insert the icpf atom in ProRes mkv packets if it isn't already present.

The patch allows to read broken mkv files containing ProRes as written by
the Haali muxer.
Fixes a part of ticket #3434.

x86/dsputil: use HADDD where applicable

Signed-off-by: James Almer <jamrial@gmail.com>
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>