vf_scale: add output h/v_chr_pos parameterss

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

doc/encoders: partially rewrite and reformat libx264 docs

Format is based on the thread:
"[PATCH] doc/encoders: Add libopus encoder doc" (06-28-2013)
http://thread.gmane.org/gmane.comp.video.ffmpeg.devel/165368/

Also merge the two option sections (Mapping and Private options).

Patch partially edited by Stefano Sabatini.

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

matroskaenc: implement CueRelativePosition

This is a minimal change to matroskaenc that implements CueRelativePosition in the output.
Most players will probably ignore this additional information, but it is in the
matroska spec, and it'd be nice to be able to make use of it.

Signed-off-by: Bernt Habermeier <bernt@wulfram.com>
Tested-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/mpeg12dec: remove commented out assert

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

documented that av_codec_close is required to call

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

alsdec: minor simplification in read_block()

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  8bps: Make the bound-checks consistent

Conflicts:
libavcodec/8bps.c

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

Merge commit 'bd7b4da0f4627bb6c4a7c2575da83fe6b261a21c'

* commit 'bd7b4da0f4627bb6c4a7c2575da83fe6b261a21c':
  8bps: Bound-check the input buffer

Conflicts:
libavcodec/8bps.c

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

Merge commit '2f034f255c49050e894ab9b88087c09ebe249f3f'

* commit '2f034f255c49050e894ab9b88087c09ebe249f3f':
  4xm: Reject not a multiple of 16 dimension

The newly added checks are redundant and thus replaced by asserts

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

Merge commit 'ca488ad480360dfafcb5766f7bfbb567a0638979'

* commit 'ca488ad480360dfafcb5766f7bfbb567a0638979':
  alsdec: Clean up error paths

Conflicts:
libavcodec/alsdec.c

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

Merge commit '70ecc175c7b513a153ac87d1c5d219556ca55070'

* commit '70ecc175c7b513a153ac87d1c5d219556ca55070':
  alsdec: Fix the clipping range

Conflicts:
libavcodec/alsdec.c

See: feaff427c0df015146f660199453bd8c0314e677

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

avformat/http: support reading compressed data

Derived from VLC's http module.
Original authors:
  Antoine Cellerier <dionoea@videolan.org>
  Sébastien Escudier <sebastien-devel@celeos.eu>
  Rémi Duraffort <ivoire@videolan.org>
  Rémi Denis-Courmont <remi@remlab.net>
  Francois Cartegnie <fcvlcdev@free.fr>

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

avcodec/utils: Warn the user about the lack of a lock manager if insufficient locks are detected

A lock manager is not the only possibility to avoid open/close locking
issues but its easier and more robust than maintaining a lot of lock/unlock
calls.

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

8bps: Make the bound-checks consistent

8bps: Bound-check the input buffer

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org

4xm: Reject not a multiple of 16 dimension

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org

alsdec: Clean up error paths

Fix at least a memory leak.

CC: libav-stable@libav.org

alsdec: Fix the clipping range

mcc_weightings is only 32 elements.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org

avcodec/utils: use av_assert0() to check validity of input pointers for start code search

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

avfilter/avfiltergraph: minor cosmetic

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

avfilter: Dont partially merge lists

This prevents the unneeded insertion of multiple aresample filters in some cases

The format merging is moved to avoid having to call the channel layout
merge twice. The channel layout merge code uses different structures and
is not compatible with the added dry run wrappers.

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

avformat/aviobuf/ffio_init_context: set seekable automatically

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  arm: Mangle external symbols properly in new vfp assembly files

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

avcodec: add avcodec_chroma_pos_to_enum()

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

avcodec: add avcodec_enum_to_chroma_pos()

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

avcodec/libopenjpegen: XYZ 12 bit support for libopenjpeg encoder

libswscale: Adding RGB => XYZ support

avformat/hls: avoid floating point arithmetic

Should make things more reproducable across platforms

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

avformat/hls: parse EXTINF duration as floating-point number

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

arm: Mangle external symbols properly in new vfp assembly files

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

arm: Mangle external symbols properly in new vfp assembly files

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  arm: Add VFP-accelerated version of qmf_32_subbands

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

Merge commit '800ffab48a7844dd5dc0a33b8f6b8e5ed718cf2e'

* commit '800ffab48a7844dd5dc0a33b8f6b8e5ed718cf2e':
  dcadsp: Add a new method, qmf_32_subbands

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

Merge commit '8b9eba664edaddf9a304d3acbf0388b5c520781d'

* commit '8b9eba664edaddf9a304d3acbf0388b5c520781d':
  arm: Add VFP-accelerated version of fft16

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

Merge commit 'ba6836c966debc56314ce2ef133c7f0c1fdfdeac'

* commit 'ba6836c966debc56314ce2ef133c7f0c1fdfdeac':
  arm: Add VFP-accelerated version of dca_lfe_fir

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

Merge commit 'b63bb251ea6d6ba23295294e37a92625c0192206'

* commit 'b63bb251ea6d6ba23295294e37a92625c0192206':
  arm: Add VFP-accelerated version of imdct_half

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

Merge commit 'd6e4f5fef0d811e180fd7541941e07dca9e11dc0'

* commit 'd6e4f5fef0d811e180fd7541941e07dca9e11dc0':
  arm: Add VFP-accelerated version of int32_to_float_fmul_array8

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

Merge commit '26ffcc7de1d98f77400a2ebe4e75055515c54587'

* commit '26ffcc7de1d98f77400a2ebe4e75055515c54587':
  dcadec: Use int32_to_float_fmul_array8

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

Merge commit '31c6f6f65c0ed5a894e26ce44ab0c3e89c82b9a2'

* commit '31c6f6f65c0ed5a894e26ce44ab0c3e89c82b9a2':
  fmtconvert: Add a new method, int32_to_float_fmul_array8

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

Merge commit 'ce9ed10ac27b9cf32a6257e083ea2f052692d971'

* commit 'ce9ed10ac27b9cf32a6257e083ea2f052692d971':
  arm: Add VFP-accelerated version of int32_to_float_fmul_scalar

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

Merge commit '41ef1d360bac65032aa32f6b43ae137666507ae5'

* commit '41ef1d360bac65032aa32f6b43ae137666507ae5':
  arm: Add VFP-accelerated version of synth_filter_float

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

Merge commit '8000206abcc82491c2a8c71e494c5477ede7264c'

* commit '8000206abcc82491c2a8c71e494c5477ede7264c':
  libspeexdec: fix detection of final terminator code

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

Merge commit '7ef760d95c73dfee021b8fdee04f65126eb7edd1'

* commit '7ef760d95c73dfee021b8fdee04f65126eb7edd1':
  configure: generate full msvc debug symbols when linking in debug mode

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

Merge commit '4719040cd1b54381796b22056a9ae37bd2b4668d'

* commit '4719040cd1b54381796b22056a9ae37bd2b4668d':
  libx264: Define X264_API_IMPORTS on MSVC/ICL

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

arm: Add VFP-accelerated version of qmf_32_subbands

               Before           After
               Mean    StdDev   Mean    StdDev  Change
This function   1323.0  98.0      746.2  60.6   +77.3%
Overall        15400.0 336.4    14147.5 288.4    +8.9%

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

dcadsp: Add a new method, qmf_32_subbands

This does most of the work formerly carried out by
the static function qmf_32_subbands() in dcadec.c.

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

arm: Add VFP-accelerated version of fft16

               Before           After
               Mean    StdDev   Mean    StdDev  Change
This function   1389.3  4.2       967.8  35.1   +43.6%
Overall        15577.5 83.2     15400.0 336.4    +1.2%

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

arm: Add VFP-accelerated version of dca_lfe_fir

               Before           After
               Mean    StdDev   Mean    StdDev  Change
This function    868.2  33.5      436.0  27.0   +99.1%
Overall        15973.0 223.2    15577.5  83.2    +2.5%

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

arm: Add VFP-accelerated version of imdct_half

               Before           After
               Mean    StdDev   Mean    StdDev  Change
This function   2653.0  28.5     1108.8  51.4   +139.3%
Overall        17049.5 408.2    15973.0 223.2     +6.7%

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

arm: Add VFP-accelerated version of int32_to_float_fmul_array8

               Before           After
               Mean    StdDev   Mean    StdDev  Change
This function    366.2  18.3      277.8  13.7   +31.9%
Overall        18420.5 489.1    17049.5 408.2    +8.0%

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

dcadec: Use int32_to_float_fmul_array8

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

fmtconvert: Add a new method, int32_to_float_fmul_array8

This is similar to int32_to_float_fmul_scalar, but
loads a new scalar multiplier every 8 input samples.
This enables the use of much larger input arrays, which
is important for pipelining on some CPUs (such as
ARMv6).

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

arm: Add VFP-accelerated version of int32_to_float_fmul_scalar

               Before           After
               Mean    StdDev   Mean    StdDev  Change
This function   1175.0   4.4      366.2  18.3   +220.8%
Overall        19285.5 292.0    18420.5 489.1     +4.7%

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

arm: Add VFP-accelerated version of synth_filter_float

               Before           After
               Mean    StdDev   Mean    StdDev  Change
This function   9295.0 114.9     4853.2 83.5    +91.5%
Overall        23699.8 397.6    19285.5 292.0   +22.9%

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

doc: add "rematrix_maxval"

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

swresample: fix negative rematrix volumns

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

swresample: Make rematrix maxvalue user settable

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

avfilter/REDUCE_FORMATS: fix bug that ended reducing too early

Prior to this it was possible that format reduction was ended
before it fully propagated leading to failure later in picking
formats.
No testcase with unmodified source exists, the case was reproduced
with less aggressive list merging though.

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

avcodec/h264_sei: Try to make code more robust by jumping to the specified SEI ends

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

libspeexdec: fix detection of final terminator code

ffplay: improve error message in case of failure, mention filtergraph configuration

configure: generate full msvc debug symbols when linking in debug mode

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

Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: fix build with disabled avfilter

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

avcodec/ff_h264_decode_sei: use skip_bits_long()

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

avcodec/ff_h264_decode_sei: Check SEI size

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

avcodec/ff_h264_decode_sei: fix integer overflow with size.

This issue is hypothetical and no testcase is available.

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

avcodec/h264_sei/ff_h264_decode_sei: fix error codes for insufficient data

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

Revert "avformat/utils: Close codec context since it is allocated by avformat_new_stream in refrence to ticket 2716"

This causes a race condition with VLC. Its plausible that other
applications also would have races with it and its just fixing a memleak when
the user application forgets to free the codec. It causes more
problems than it solves in its current form, thus the revert.
Better solutions are welcome

This reverts commit 0f229f9b91fe3c4ebd97e88f004d638819b76add.

h264: add frame packing as stereo_mode frame metadata

This matches the matroska defintion of stereo_mode, with
no metadata written if no info exist in sei

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

avformat/utils: Close codec context since it is allocated by avformat_new_stream in refrence to ticket 2716

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

libx264: Define X264_API_IMPORTS on MSVC/ICL

libx264 has a few data exports which require X264_API_IMPORTS
to be defined if we link to libx264 dynamically on Windows.

In a similar fashion to how we handle our compat snprintf
implementation, if we define it all the time, the compiler
will first try and link to __imp_x264_symbol_name, and failing
that, as in the case of a static libx264, will attempt to link
to the non-prefixed symbol, which has already been pulled in by
other x264 functions' object files.

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  dsicinav: Clip the source size to the expected maximum

Clipping the compressed size based on the uncompressed size is not correct
thus this commit is not merged, and the merge is for git metadata only

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

ffplay: fix build with disabled avfilter

Got broken in b383498e.

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

Merge commit 'dd0bfc3a6a310e3e3674ce7742672d689a9a0e93'

* commit 'dd0bfc3a6a310e3e3674ce7742672d689a9a0e93':
  dsicinav: Bound-check the source buffer when needed

Conflicts:
libavcodec/dsicinav.c

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

Merge commit 'fcae3ff124ee97c9265e3b93f3d41238b2aee9bd'

* commit 'fcae3ff124ee97c9265e3b93f3d41238b2aee9bd':
  dsicinav: K&R formatting cosmetics

Conflicts:
libavcodec/dsicinav.c

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

vfilter/vf_scale: avoid using "{}"

Should fix compile issues with MSVC

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

avcodec/snowenc: convert speed relevant asserts to av_assert2()

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

avcodec/snowdec: remove assert.h include, its unused

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

jpeg2000dec: Support non subsampled 9-16bit planar pixel formats

This applies changes similar to fc6de70c44be05eb0368ab519bfb790431d8dee5
to the >8bit codepath

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

doc/filters: document vf_scales color range

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

avfilter/vf_scale; fix indent

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

avfilter/vf_scale: add in/out color range option

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

avfilter/vf_scale: Add in/out yuv color matrix option

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

lavu/log: print prefix after \r.

Should fix trac ticket #2797 because of the progress line.

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavfi: filtfmts: use newer avfilter APIs

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

Merge commit '36fb0d02a1faa11eaee51de01fb4061ad6092af9'

* commit '36fb0d02a1faa11eaee51de01fb4061ad6092af9':
  rtsp: Support multicast source filters (RFC 4570)
  rtpproto: Check the source IP if one single source has been specified
  rtpproto: Support IGMPv3 source specific multicast inclusion

Conflicts:
libavformat/rtpproto.c
libavformat/rtsp.c
libavformat/rtsp.h

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

ffplay: use start_time as next audio pts on flush when seeking is not supported

Theoretically using start_time should also work if seeking is available and we
could determine that the next packet after a flush packet is the first packet
of a stream, but I could not think of an easy and clean way to do that, that is
why I sticked to the no seeking available condition for now.

Fixes ticket #2647.

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

ffplay: estimate audio frame pts from the previous frame pts values

Previously we estimated the audio packet pts instead of the frame pts,
therefore it only worked within a single packet (containing multiple frames).

The new method works accross seperate audio packets as well and also handles
better the case if a decoder buffers several packets before outputting a
decoded frame.

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

ffplay: simplify audio decoding

Also use negative stream_index for signaling obsolete audio packets. Using the
size alone is not enough, because size is 0 for null packets as well.

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

avfilter/vf_separatefields: fix ;;

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

avformat/matroskaenc: Only change chapter ids if needed.

This also fixes the case where negative chapter ids where input
And fixes the case where remuxing from mkv changed chapter ids

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

dsicinav: Clip the source size to the expected maximum

A packet larger than cin->bitmap_size does not make sense.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org

dsicinav: Bound-check the source buffer when needed

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org

dsicinav: K&R formatting cosmetics

avfilter: fix preprocessor condition

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

doc/filters: add sepia example for colorchannelmixer

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

avutil/softfloat: remove unneeded include assert.h

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

tests/tiny_psnr: remove unneeded include assert.h

This is the only such occurance on tests/

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

avfilter/vf_yadif:remove unneeded include assert.h

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

swscale: remove unneeded include assert.h

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