Merge remote-tracking branch 'qatar/master'

* qatar/master:
  atrac3: Generalize gain compensation code

Conflicts:
libavcodec/atrac.c
libavcodec/atrac.h
libavcodec/atrac3.c

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

Merge commit '5ce04c14dd3dd3670cbdba82275a3a72c716ec6f'

* commit '5ce04c14dd3dd3670cbdba82275a3a72c716ec6f':
  Use correct Doxygen syntax

Conflicts:
libavcodec/atrac3.c

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

Merge commit '4be292dac7e7f0586053fcced8d530ccf4ebef29'

* commit '4be292dac7e7f0586053fcced8d530ccf4ebef29':
  atrac: Move doxygen comments to the header

Conflicts:
libavcodec/atrac.c
libavcodec/atrac.h

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

Merge commit 'be0b4c70ec40d7f9ac8e416a4379d4a387421184'

* commit 'be0b4c70ec40d7f9ac8e416a4379d4a387421184':
  atrac3: Replace a silly counter variable name with plain 'j'

Conflicts:
libavcodec/atrac3.c

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

avcodec/h264_sei: make SEI type truncated message more informative

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

avcodec/jpeg2000dec: Zero code and quant style

This prevents future frames from using half initialized/inconsistent
structures
Fixes assertion failure
Fixes Ticket2897

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/tiff_common: Improve formating of long arrays

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

atrac3: Generalize gain compensation code

Move it to the ATRAC common code, to reuse in the upcoming ATRAC3+ decoder.

Signed-off-by: Diego Biurrun <diego@biurrun.de>

Use correct Doxygen syntax

atrac: Move doxygen comments to the header

Also update copyright info and file description.

Signed-off-by: Diego Biurrun <diego@biurrun.de>

atrac3: Replace a silly counter variable name with plain 'j'

ffmpeg: avoid direct access to lowres use av_codec_g/set_lowres()

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

avcodec: add av_codec_get_max_lowres()

Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avfilter/vf_histogram: add mirrored waveform mode

Added parameter to mirror the waveform (high values are shown on top in column mode)

Signed-off-by: Marton Balint <cus@passwd.hu>

avfilter/vf_histogram: fix segfault in parade waveform mode for subsampled formats

Signed-off-by: Marton Balint <cus@passwd.hu>

Merge remote-tracking branch 'rbultje/master'

* rbultje/master:
  Full-pixel MC functions.
  VP9 MC (ssse3) optimizations.
  Native VP9 decoder.

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavc: mark deprecated AVCodec.max_lowres for removal on next bump

Conflicts:
libavcodec/avcodec.h

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

Merge commit '06e7301a2efa8dededecbe6836ee5b59bf7e5e76'

* commit '06e7301a2efa8dededecbe6836ee5b59bf7e5e76':
  vf_interlace: do not process an already interlaced frame

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

ffprobe: print stream channel_layout when available

Fix trac ticket #3006.

Full-pixel MC functions.

Decoding time of ped1080p.webm goes from 11.3sec to 11.1sec.

VP9 MC (ssse3) optimizations.

Decoding time of ped1080p.webm goes from 20.7sec to 11.3sec.

Native VP9 decoder.

Authors: Ronald S. Bultje <rsbultje gmail com>,
         Clement Boesch <u pkh me>

Print pix_fmt name on h264 context reinitialisation.

ffmpeg: add support to force specific AVCodecs

previously only codec_ids could be forced, which did not allow
forcing a specific implementation like libopenjpeg vs jpeg2000.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avformat: add support to force specific AVCodecs

previously only codec_ids could be forced, which did not allow
forcing a specific implementation like libopenjpeg vs jpeg2000.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avformat/utils: pass AVFormatContext to find_decoder()

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

VC1 VDPAU: Mark missing reference frames as such.

Currently the code passes some nonsense values as
references instead, causing corruption with NVidia's
and assertion failures with Mesa's implementation.
For non-corrupted input this mostly happens in
interlaced bitstreams, e.g.
http://samples.mplayerhq.hu/V-codecs/WMV9/interlaced/480i30__codec_WVC1__mode_2__framerate_29.970__type_2__preproc_17.wmv.
The != VDP_INVALID handle assert does not trigger
(and probably is quite nonsense) because the frames
are initialized to 0.

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

mov: fix trun / pseudo_stream_id handling

This fixes simple concatenated h264

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

avcodec/imgconvert/get_color_type: fix type for PAL8

Fixes Ticket3008

Fate changes as PAL8 gets used instead of BGR8

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

avcodec: use designated initializers for bitstream filters

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

lavc: mark deprecated AVCodec.max_lowres for removal on next bump

vf_interlace: do not process an already interlaced frame

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  rtmp: alias rtmp_listen to listen

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

Merge commit 'ad0560fe7491a85c3e71d5a3d6a0443f10b33ab1'

* commit 'ad0560fe7491a85c3e71d5a3d6a0443f10b33ab1':
  mxf: Remove a typo

Conflicts:
libavformat/mxfdec.c

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

Merge commit 'cc41167aede4c101ad17eeffa8f39bb6c23d3dad'

* commit 'cc41167aede4c101ad17eeffa8f39bb6c23d3dad':
  asfdec: Check the return value of asf_read_stream_properties

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

avfilter/avf_showspectrum: use the name 's' for the pointer to the private context

avfilter/af_afade: use the name 's' for the pointer to the private context

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

ffmpeg: dont return reserved values

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

avfilter/vf_removelogo: use the name 's' for the pointer to the private context

avfilter/af_silencedetect: use the name 's' for the pointer to the private context

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

atrac3: Generalize gain compensation code

Move it to the ATRAC common code, so it can be reused
in the umpcoming ATRAC3+ decoder.

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

atrac3/decode_gain_control: cosmetics

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

atrac3: rename num_gain_data to num_points

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

atrac3: Rename GainInfo to AtracGainInfo

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

atrac: limit line length to 80 chars

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

atrac: Move doxygen comments to the header

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

atrac: Update copyright info and file description.

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

atrac: Add missing av_cold.

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

avcodec/wmalosslessdec: check block_align

Code copied from wmaprodec

Fixes null pointer dereference
Fixes Ticket3002

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

Revert "Merge commit '61c31e4ee7ea79a9e74c0476b81244febf17e6d7'" (configure: Properly set zlib dependencies for all components)

The reverted commit introduced undefined behavior.
undefined in the sense that the evaluation order of the dependencies affects the results

Fixes Ticket2920

This reverts commit c32db6adab9942781cc5a23f62abb839a5595a83, reversing
changes made to 05f1b4e2ecc4683467669a190e3a53df413de805.

Alternative solutions would be to change the dependency solver to handle non trivial
dependencies or to enable zlib by default before the dependency solver, this would
leave a zlib dependency in the libs though then even when no zlib is needed or used.

avfilter/vf_histogram: change order of histograms for planar rgb

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

avfilter/vf_histogram: add support for subsampled planar yuv modes in waveform mode

Signed-off-by: Marton Balint <cus@passwd.hu>

avfilter/vf_histogram: improve waveform speed

Signed-off-by: Marton Balint <cus@passwd.hu>

avcodec/fraps: increase vlc nb_bits

This should fix decoding the file in:
http://ffmpeg.gusari.org/viewtopic.php?f=16&t=1078
No i dont have the file so i cant test

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

configure: fix logic for threads in case of OpenCL is enabled. Fixes ticket 3004.

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

rtmp: alias rtmp_listen to listen

Make it uniform with the other protocols.

mxf: Remove a typo

Introduced in 93370d1216

swscale/utils: dont divide by zero with zero vectors

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

swscale: make bilinear scaling the default

Before this commit, sws_init_context() failed with an error if no scaler
was explicitly set.

Defaulting to something reasonable is better behavior.

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

fate: add fieldorder test

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

doc: move sws_dither option description to scaler.texi

That's the more proper place where the scaler options should be
documented.

doc/filters/scale: mention and link scaler options

doc/filters/scale: fix MAN rendering of @ref arguments

doc: try to add a link from the vf_scale sws_flags to the scaler docs

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

avfilter/vf_hflip: support slice threading

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

avfilter/vf_hflip: refactor plane dimensions calculation

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

avfilter/vf_rotate: support slice threading

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

skip_bits: dont call UPDATE_CACHE

UPDATE_CACHE isnt needed and can cause segfaults

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

cmdutils: print command support in -filters.

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

configure: fix build with enable-xmm-clobber-test

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

doc/t2h.init: remove resource-type and distribution meta elements

The W3C validator complains about these.

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

Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Avoid img_segment_size == 0 in mtv demuxer.

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

avfilter/dualinput: simplify

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

asfdec: Check the return value of asf_read_stream_properties

This makes sure errors in setting stream parameters are passed
on to the caller. This avoids successfully opening files while
some parameters aren't filled in properly.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>

Avoid img_segment_size == 0 in mtv demuxer.

Fixes ticket #3011.

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  omadec: fix bitrate for ATRAC3+ streams

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

Merge commit '23d0fdcf6f30843fc3f14084d80581f1ca10f1f3'

* commit '23d0fdcf6f30843fc3f14084d80581f1ca10f1f3':
  Add support for multichannel ATRAC3+ streams.

Conflicts:
libavformat/oma.c

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

Merge commit '93370d12164236d59645314871a1d6808b2a8ddb'

* commit '93370d12164236d59645314871a1d6808b2a8ddb':
  mxfdec: set audio timebase to 1/samplerate

Conflicts:
libavformat/mxfdec.c
tests/ref/fate/mxf-demux
tests/ref/seek/lavf-mxf
tests/ref/seek/lavf-mxf_d10

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

Merge commit 'ff07ec143ebd3833fd5a3f4b6c00474ac523a31f'

* commit 'ff07ec143ebd3833fd5a3f4b6c00474ac523a31f':
  pcx: Return an error on broken palette if err_detect is set to 'explode'

Conflicts:
libavcodec/pcx.c

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

Merge commit 'd1d99e3befea5d411ac3aae72dbdecce94f8b547'

* commit 'd1d99e3befea5d411ac3aae72dbdecce94f8b547':
  pcx: Check the packet size before assuming it fits a palette

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

Merge commit '7ba0cedbfeff5671b264d1d7e90777057b5714c6'

* commit '7ba0cedbfeff5671b264d1d7e90777057b5714c6':
  rpza: Fix a buffer size check

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

Merge commit 'aa0dd52434768da64f1f3d8ae92bcf980c1adffc'

* commit 'aa0dd52434768da64f1f3d8ae92bcf980c1adffc':
  xxan: Disallow odd width

See: 77693c541a541661357a0edd5bbaae69c64b2039
See: 8ad9b48c9b5b749df8fbcd59d61278caadc478ca
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'fc739b3eefa0b58d64e7661621da94a94dbc8a82'

* commit 'fc739b3eefa0b58d64e7661621da94a94dbc8a82':
  xan: Only read within the data that actually was initialized

Conflicts:
libavcodec/xan.c

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

Merge commit '30db94dc399f6e4ef8905049d9b740556f0fce47'

* commit '30db94dc399f6e4ef8905049d9b740556f0fce47':
  xan: Use bytestream2 to limit reading to within the buffer

Conflicts:
libavcodec/xan.c

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

Merge commit '9fb0de86b49e9fb0709a8ad1e1875e35da841887'

* commit '9fb0de86b49e9fb0709a8ad1e1875e35da841887':
  pcx: Consume the whole packet if giving up due to missing palette

Conflicts:
libavcodec/pcx.c

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

Merge commit 'a81cad8f86d1feb7e4bfae29e43f3e994935a5c7'

* commit 'a81cad8f86d1feb7e4bfae29e43f3e994935a5c7':
  pngdec: Stop trying to decode once inflate returns Z_STREAM_END

Conflicts:
libavcodec/pngdec.c

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

Merge commit 'c231987662194d009dd91bfc57c678e0e70ca161'

* commit 'c231987662194d009dd91bfc57c678e0e70ca161':
  mov: Make sure the read sample count is nonnegative

Conflicts:
libavformat/mov.c

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

Merge commit '640a2427aafa774b83316b7a8c5c2bdc28bfd269'

* commit '640a2427aafa774b83316b7a8c5c2bdc28bfd269':
  bfi: Add some very basic sanity checks for input packet sizes

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

Merge commit '9fc7184d1a9af8d97b3fc5c2ef9d0a647d6617ea'

* commit '9fc7184d1a9af8d97b3fc5c2ef9d0a647d6617ea':
  bfi: Avoid divisions by zero

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

Merge commit 'a9221e39600a31ee13e736e9e47743cde23f0280'

* commit 'a9221e39600a31ee13e736e9e47743cde23f0280':
  electronicarts: Add more sanity checking for the number of channels

Note: This check is probably unnecessary
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'd07aa3f02b73ab1371c13ac7898338380ca0932b'

* commit 'd07aa3f02b73ab1371c13ac7898338380ca0932b':
  riffdec: Add sanity checks for the sample rate

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

swr: fix example code and doxy indent.

doc/faq: add @command{} in the tool debug entry.

doc/faq: remove indent in examples.

CSS should take care of this.

doc/faq: remove Delphi/Pascal entry.

Link is dead.

doc/faq: rework r_frame_rate entry.

Merge commit '28ff439efd2362fb21e1a78610737f2e26a72d8f'

* commit '28ff439efd2362fb21e1a78610737f2e26a72d8f':
  mvi: Add sanity checking for the audio frame size

Conflicts:
libavformat/mvi.c

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

Merge commit '59480abce7e4238e22b3a4a904a9fe6abf4e4188'

* commit '59480abce7e4238e22b3a4a904a9fe6abf4e4188':
  alac: Do bounds checking of lpc_order read from the bitstream

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

Merge commit 'adc09136a4a63b152630abeacb22c56541eacf60'

* commit 'adc09136a4a63b152630abeacb22c56541eacf60':
  xwma: Avoid division by zero

Conflicts:
libavformat/xwma.c

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

Merge commit '8d07258bb6063d0780ce2d39443d6dc6d8eedc5a'

* commit '8d07258bb6063d0780ce2d39443d6dc6d8eedc5a':
  avidec: Make sure a packet is large enough before reading its data

Conflicts:
libavformat/avidec.c

See: 028cc42a1638e6f93a857f11c2568d1c3a51e612
Note: data!=NULL implies that the allocated array is at least FF_INPUT_BUFFER_PADDING_SIZE large
Merged-by: Michael Niedermayer <michaelni@gmx.at>