Merge remote-tracking branch 'qatar/master'

* qatar/master:
  dsputil: remove unused macro WRAPPER8_16
  configure: fix automatic processing of _extralibs in check_deps
  libvpxenc: Support forcing keyframes
  ac3dec: decode directly into output buffers

Conflicts:
libavcodec/ac3dec.c
libavcodec/libvpxenc.c

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

Merge commit '30b39164256999efc8d77edc85e2e0b963c24834'

* commit '30b39164256999efc8d77edc85e2e0b963c24834':
  ac3dec: make downmix() take array of pointers to channel data

Conflicts:
libavcodec/ac3dsp.c
libavcodec/ac3dsp.h

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

Merge commit 'b8f3ab8e6a7ce3627764da53b809628c828d4047'

* commit 'b8f3ab8e6a7ce3627764da53b809628c828d4047':
  ac3dec: output planar float only
  svq3: make slice type value unsigned to match svq3_get_ue_golomb return type
  configure: Have protocols select network code instead of depending on it

Conflicts:
libavcodec/svq3.c

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

Merge commit '5d471b73d20616f5ac701ff62e5de49465cda264'

* commit '5d471b73d20616f5ac701ff62e5de49465cda264':
  rtpdec: K&R formatting and spelling cosmetics
  cosmetics: Fix dropable --> droppable typo

Conflicts:
libavcodec/h264.c

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

configure: fix automatic processing of _extralibs in check_deps

This fixes the automatic use of $foo_extralibs when feature foo
is enabled indirectly through a _select or _suggest.

Signed-off-by: Mans Rullgard <mans@mansr.com>

http/utils: rename "demuxer" to mime_type

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

ffserver: set oformat

Fix Ticket1986

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

dsputil: remove unused macro WRAPPER8_16

This macro has never been used.

Signed-off-by: Mans Rullgard <mans@mansr.com>

tak: reduce difference with qatar

Mostly cosmetics changes, but also makes
decoding little faster here.

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

configure: fix automatic processing of _extralibs in check_deps

This fixes the automatic use of $foo_extralibs when feature foo
is enabled indirectly through a _select or _suggest.

Signed-off-by: Mans Rullgard <mans@mansr.com>

lavc/avcodec: extend/clarify/fix documentation for avcodec_fill_audio_frame()

lavf/segment: remove silly assert(), improve feedback

The code should not assert in case of invalid user input. Fails
gracefully instead.

http/utils: move mime -> demuxer maping from http to utils

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

mpeg12: move current_picture_ptr reset to the end of decode_frame.

This fixes passing fields instead of frames into the decoder.

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

libvpxenc: Support forcing keyframes

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

probe: belive protocol content type if set and avoid lengthly probing.

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

http: export ICY content type

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

lavf: TED Talks JSON captions demuxer.

Improve x264opts description.

mpegts: demux asynchronous SMPTE 336M Key-Length-Value (KLV) metadata

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

arm: put prefetch under matching #ifdef as the actual code

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

ac3dec: make downmix() take array of pointers to channel data

ac3dec: output planar float only

Signed-off-by: Mans Rullgard <mans@mansr.com>

ac3dec: decode directly into output buffers

Signed-off-by: Mans Rullgard <mans@mansr.com>

svq3: make slice type value unsigned to match svq3_get_ue_golomb return type

configure: Have protocols select network code instead of depending on it

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avio: K&R cosmetic formatting

Conflicts:
libavformat/aviobuf.c

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

Merge commit '91ac403b1316d59b4f43c4ea0f237e24cec2819a'

* commit '91ac403b1316d59b4f43c4ea0f237e24cec2819a':
  lavf: fix arithmetic overflows in avformat_seek_file()
  mjpeg: initialize input padding after unescaped buffer to zero

Conflicts:
libavformat/utils.c

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

rtpdec: K&R formatting and spelling cosmetics

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

cosmetics: Fix dropable --> droppable typo

Merge commit '18e6f087c4a50bede8449ee164778945480be50c'

* commit '18e6f087c4a50bede8449ee164778945480be50c':
  img2: document the options available
  hls: improve options description
  hls: use a meaningful long name
  hls: add start_number option
  h264: check for invalid zeros_left before writing

Conflicts:
doc/demuxers.texi
doc/muxers.texi

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

mxfdec: fix double free

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

Flip zerocodec output.

Fixes ticket #1218

avio: K&R cosmetic formatting

h264: avoid calling idr() twice

Fixes rare race condition leading to null pointer dereferences.

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

lavc/libcelt: add missing internal.h include.

This should fix build (include is necessary for ff_get_buffer).

add forgotten AV_ prefix to some CODEC_IDs

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

tiff: support zlib with invertedFillOrder

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

lavu/opt: change the way ranges are printed

dshow: fix return code when opening device

Successfully opening a device altered the ret variable, making the function
not cleanup properly and return an incorrect value for errors that happened
afterwards.

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

lavf: fix arithmetic overflows in avformat_seek_file()

The values compared here can be more than INT64_MAX apart.  Since the
difference is always positive, converting to uint64_t before subtracting
gives the correct result without overflows.

Signed-off-by: Mans Rullgard <mans@mansr.com>

lavu/opt: make av_opt_query_ranges_default() return a meaningful error code

mjpegdec: support more pix_fmt_ids for grayscale

samples created with

"cjpeg -grayscale -sample 1x3 / 1x4 / 3x1 / 3x3 / 4x1 / 4x3 / 4x4"

http://www.datafilehost.com/download-d828329d.html

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

lavu/opt: perform misc cosmetical fixes

lavfi/setfield: add support to named options and introspection

sbr_hf_gen_sse: Optimize code a bit more.

Core I7 (Sandy Bridge) 135 to 107 cycles
Core i5 (Arrandale) 162 to 142 (Thanks to Christophe Gisquet for testing)

Reviewed-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

lavfi/setfield: switch to filter_frame API

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

lavfi/idet: switch to filter_frame API

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

mjpeg: initialize input padding after unescaped buffer to zero

Fixes valgrind --undef-value-errors=yes warnings caused by valid
overreads in the fate vsynth jpegls, cover-art-ape and cover-art-wv
tests.

img2: document the options available

hls: improve options description

hls: use a meaningful long name

hls: add start_number option

h264: check for invalid zeros_left before writing

Prevent an invalid write into coeffs[scantable[-1]] if zeros_left
itself was an invalid VLC code (and thus -1).

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  golomb: use unsigned arithmetics in svq3_get_ue_golomb()
  x86: float_dsp: fix loading of the len parameter on x86-32
  takdec: fix initialisation of LOCAL_ALIGNED array
  takdec: fix initialisation of LOCAL_ALIGNED array

Conflicts:
libavcodec/rv30.c
libavcodec/svq3.c
libavcodec/takdec.c

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

MAINTAINERS: add myself for my works

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

lavfi/version: remove unused dropped symbol

Merge commit '57231e4d5b467833fb289439cd35a92513bb55c1'

* commit '57231e4d5b467833fb289439cd35a92513bb55c1':
  tak: demuxer, parser, and decoder

Not merged as requested by Author and Maintainer of tak in FFmpeg.
I just merged a few typo fixes and minor cosmetic improvments.

Conflicts:
Changelog
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/avcodec.h
libavcodec/tak.c
libavcodec/tak.h
libavcodec/tak_parser.c
libavcodec/takdec.c
libavcodec/version.h
libavformat/takdec.c
libavformat/version.h

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

doc/filters: move volumedetect documentation below volume

lavfi: drop af_volume_stefano.c in favor of af_volume_justin.c

Justin's version has more features but is otherwise equivalent from the
point of view of the syntax.

doc/filters: fix copy&paste error in volume_justin documentation

Spotted by ubitux.

lavfi/volume_justin: add support to option shorthands and introspection

lavfi/volume_justin: fix a few grammar inconsistencies in options description

doc: sync avoid_negative_ts option with internal help.

Merge commit '096abfa15052977eed93f0b5e01afd2d47c53c1f'

* commit '096abfa15052977eed93f0b5e01afd2d47c53c1f':
  parser: fix large overreads
  bitstream: add get_bits64() to support reading more than 32 bits at once
  arm: detect cpu features at runtime on Linux

Conflicts:
libavcodec/parser.c
libavformat/mpegts.c

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

get_bits: rename get_bits_longlong to get_bits64

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

mpegts: rename get_bits64 to get_ts64

Renaming because of name conflict

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

Merge commit 'b326755989b346d0d935e0628e8865f9b2951c30'

* commit 'b326755989b346d0d935e0628e8865f9b2951c30':
  arm: rename ARMVFP config symbol to VFP

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

Merge commit '637606de2d2e0af0a9fa2f23f943765d7d7c5cd5'

* commit '637606de2d2e0af0a9fa2f23f943765d7d7c5cd5':
  configure: arm: make _inline arch ext symbols depend on inline_asm
  arm: use HAVE*_INLINE/EXTERNAL macros for conditional compilation

Conflicts:
configure
libavcodec/arm/dca.h

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

Merge commit '7f2b3dcabd108926bde819ad574017f4161d1546'

* commit '7f2b3dcabd108926bde819ad574017f4161d1546':
  configure: arm: check inline and external asm support for extensions

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

Merge commit 'c6ebc9faa2210d7f36a3036c357f6f199520f575'

* commit 'c6ebc9faa2210d7f36a3036c357f6f199520f575':
  configure: add check_insn function
  configure: clean up check_inline_asm and check_as functions

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

Merge commit 'f0fe245bc31cf4fa3b3ed0240cd1ab6f0d5043ea'

* commit 'f0fe245bc31cf4fa3b3ed0240cd1ab6f0d5043ea':
  configure: arm: set fast_clz and fast_unaligned in cpuflags section

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

Merge commit '1234c66a315b139339d52ca193b3f1d67af9ce19'

* commit '1234c66a315b139339d52ca193b3f1d67af9ce19':
  configure: arm: detect toolchain default arch version

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

Merge commit '9ebd45c2d58ad9241ad09718679f0cf7fb57da52'

* commit '9ebd45c2d58ad9241ad09718679f0cf7fb57da52':
  configure: do not bypass cpuflags section if --cpu not given
  dct-test: arm: indicate required cpu features for optimised funcs
  snow: fix build after 594d4d5df3c70404168701dd5c90b7e6e5587793
  arm: fix use of uninitialised value in ff_fft_fixed_init_arm()
  avpicture: Don't assume a valid pix fmt in avpicture_get_size

Conflicts:
libavcodec/avpicture.c
libavcodec/snow.c

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

lavf: improve avoid_negative_ts help text

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

golomb: use unsigned arithmetics in svq3_get_ue_golomb()

This prevents undefined behaviour of signed left shift if the coded
value is larger than 2^31. Large values are most likely invalid and
caused errors or by feeding random.

Validate every use of svq3_get_ue_golomb() and changed the place there
the return value was compared with negative numbers. dirac.c was clean,
fixed rv30 and svq3.

lavfi/sendcmd: switch to filter_frame API

lavfi/swapuv: switch to filter_frame API

lavc/mlpdec: reset layout when channels change.

Triggered by the sample for trac ticket #1726.

x86: float_dsp: fix loading of the len parameter on x86-32

gifdec: port to bytestream2 API

While here remove ff_lzw_cur_ptr() as it become obsolete.

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

opt_list: fix vertical alignment of types

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

opt: print ranges in opt_list()

The formating can and should be improved.

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

opt: Add support to query ranges

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

takdec: fix initialisation of LOCAL_ALIGNED array

When LOCAL_ALIGNED uses manual alignment initialisation is not
possible.

Signed-off-by: Janne Grunau <janne-libav@jannau.net>

takdec: fix initialisation of LOCAL_ALIGNED array

When LOCAL_ALIGNED uses manual alignment initialisation is not
possible.

Signed-off-by: Mans Rullgard <mans@mansr.com>

lavc: check dimensions for video encoders

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

tak: demuxer, parser, and decoder

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>

parser: fix large overreads

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>

bitstream: add get_bits64() to support reading more than 32 bits at once

Also remove a duplicate function in the MPEG-TS demuxer.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>

sws_scale: check input against NULL

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

lavf: VobSub demuxer.

lavfi/alphaextract: consistently prefer "cur" over "in" in filter_frame()

Improve consistency/readability.

lavfi/alphaextract: access outlink properties rather than out_buf->video

Avoid one dereference, simplify.

lavfi/alphaextract: fix assignment of invalid size value to memcpy in case linesize < 0

Fix crash, for example in the command:
ffmpeg -f image2 -vcodec pgmyuv -i tests/vsynth1/%02d.pgm \
  -vf "[in]format=yuv420p,split,alphamerge,split[o3][o4];
       [o4]vflip,alphaextract[alpha];[o3][alpha]alphamerge[out]" \
  -vcodec rawvideo -f nut md5:

lavfi/alphaextract: switch to filter_frame() API

lavfi/alphaextract: drop cur_linesize = out_linesize branch in draw_slice()

The code causes uninitialized data copy, and may be actually slower than
a loop over each line in case the padding is big.

brstm: do not return partial packets

Such packets are useless.

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

arm: rename ARMVFP config symbol to VFP

This is consistent with usual ARM nomenclature as well as with the
VFPV3 and NEON symbols which both lack the ARM prefix.

Signed-off-by: Mans Rullgard <mans@mansr.com>

arm: detect cpu features at runtime on Linux

This allows compiling optimised functions for features not enabled
in the core build and selecting these at runtime if the system has
the necessary support.

Signed-off-by: Mans Rullgard <mans@mansr.com>