lavf/concatdec: define "ffcat" and "ffconcat" extensions

build: fix iconv detection on some systems.

This at least fix the build on CentOS.

lavc/libopusenc: report an error if global_quality is set.

ffmpeg: free last sub when using -fix_sub_duration.

Fix trac ticket #2242.

Note: under valid circumstances, when using -fix_sub_duration,
the last subtitle is a dummy termination packet, with no
allocated memory.

Merge remote-tracking branch 'fredjean/master'

* fredjean/master:
  Include fix for building ismindex under MinGW

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

Include fix for building ismindex under MinGW

Include cmdutils.h so we can build under windows.

Based on fix for https://ffmpeg.org/trac/ffmpeg/ticket/256

exr: simplify decompression path

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

dv: Correctly identify CDVC profile

Fixes Ticket2177

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

vf_lut: correct color/comp permutation

Fixes Ticket2225

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

swscale: Add support for unscaled 8-bit Packed RGB -> Planar RGB

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  x86: dsputil: Drop some unused function #defines

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

Merge commit '845cfc92f908791714b8c4c8a49c91b8c64b685e'

* commit '845cfc92f908791714b8c4c8a49c91b8c64b685e':
  x86: dsputil: Drop aliasing of ff_put_pixels8_mmx to ff_put_pixels8_mmxext

Conflicts:
libavcodec/x86/dsputil_mmx.c

Note, the commit message is wrong, there are no mmxext instructions as
claimed in the function. The change should do no harm though

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

Merge commit '096cc11ec102701a18951b4f0437d609081ca1dd'

* commit '096cc11ec102701a18951b4f0437d609081ca1dd':
  x86: vc1dsp: Move ff_avg_vc1_mspel_mc00_mmxext out of dsputil_mmx.c

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

Merge commit '31a23a0dc663bd42bf593275971b4277a479b73d'

* commit '31a23a0dc663bd42bf593275971b4277a479b73d':
  x86: dsputil_mmx: Remove leftover inline assembly fragments

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

oggdec: chained oggs have timestamp discontinuities

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

avcodec: mbd has a range of 0..2

Fixes Ticket2219

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

mpegvideo_enc: fix gray flag with 444 jpeg

Fixes Ticket2155

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

ffmpeg_opt: add -to option to specify stop time

Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

x86: dsputil: Drop some unused function #defines

x86: dsputil: Drop aliasing of ff_put_pixels8_mmx to ff_put_pixels8_mmxext

The external assembly function uses mmxext instructions and should not be
masqueraded as an mmx-only function. Instead, use the mmx-only inline
assembly function.

x86: vc1dsp: Move ff_avg_vc1_mspel_mc00_mmxext out of dsputil_mmx.c

x86: dsputil_mmx: Remove leftover inline assembly fragments

These became unused in 71155d7b.

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

mpeg12: Detect MXF essence stuff at the end of frames

Fixes some of the issues with segment.mov

See: 0226 15:16 Joseph Artsimov (2.1K) [FFmpeg-devel] Two problems with MPEG2 decoder
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

swscale-test: fix 3 pointer type warnings

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

aacsbr: Silence warning: max_qmf_subbands may be used uninitialized in this function

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: icc: Drop nonsense adding of cpuflags to LDFLAGS

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

Merge commit 'c242bbd8b6939507a1a6fb64101b0553d92d303f'

* commit 'c242bbd8b6939507a1a6fb64101b0553d92d303f':
  Remove unnecessary dsputil.h #includes

Conflicts:
libavcodec/ffv1.c
libavcodec/h261dec.c
libavcodec/h261enc.c
libavcodec/h264pred.c
libavcodec/lpc.h
libavcodec/mjpegdec.c
libavcodec/rectangle.h
libavcodec/x86/idct_sse2_xvid.c

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

Merge commit '76b19a3984359b3be44d4f7e4e69b7b86729a622'

* commit '76b19a3984359b3be44d4f7e4e69b7b86729a622':
  Fix a number of incorrect intmath.h #includes.
  avconv: remove an unused variable

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

Merge commit 'e8da807537e314d74cb6d93598f1dcfb891fa655'

* commit 'e8da807537e314d74cb6d93598f1dcfb891fa655':
  cmdutils: only use libavresample when it is enabled
  libschroedinger: cosmetics: rename variable avccontext to avctx
  vorbisenc: cosmetics: rename variable avccontext to avctx

Conflicts:
cmdutils.c
libavcodec/libschroedinger.c
libavcodec/libschroedingerenc.c
libavcodec/vorbisenc.c

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

Merge commit 'e951b6d94c441d46b396ef12da1428297d77251d'

* commit 'e951b6d94c441d46b396ef12da1428297d77251d':
  vorbisdec: cosmetics: rename variable avccontext to avctx
  configure: Identify icc compiler with a less ambiguous pattern

Conflicts:
libavcodec/vorbisdec.c

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

Merge commit 'b58b00aeca21de00ab6da2944684f784d9d6bc47'

* commit 'b58b00aeca21de00ab6da2944684f784d9d6bc47':
  configure: Separate "ln" command line arguments

Conflicts:
configure

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

ac3enc_template: silence may be used uninitialized in this function warnings

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

motion-test: fix warning: dsp_mask is deprecated

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

libavcodec/motion-test: set the bitexact flag

this is needed for testing mmx2 functions

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

configure: icc: Drop nonsense adding of cpuflags to LDFLAGS

This fixes many icc warnings when not setting the CPU type.

Remove unnecessary dsputil.h #includes

Fix a number of incorrect intmath.h #includes.

avconv: remove an unused variable

cmdutils: only use libavresample when it is enabled

avprobe and avserver use cmdutils and do not strictly require libavresample.

vorbisdec: cosmetics: rename variable avccontext to avctx

This is consistent with the rest of libavcodec.

libschroedinger: cosmetics: rename variable avccontext to avctx

This is consistent with the rest of libavcodec.

vorbisenc: cosmetics: rename variable avccontext to avctx

This is consistent with the rest of libavcodec.

libvpx: check if CQ level is in correct bounds

Check whether CQ level is within qmin..qmax and abort on error. If this isn't properly
set, encoding will fail at the first frame.

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

libvpx: allow 0 as min quantizer value

Allow setting the min quantizer to 0 instead of 1 (libvpx allows 0); fixes #2136

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

ffmpeg_opt: cosmetics

Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

pmpdec: make i unsigned, avoid undefined behavior of i++

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

pmpdec: fix integer overflow

Its unlikely this affects any valid files.

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

configure: Identify icc compiler with a less ambiguous pattern

configure: Separate "ln" command line arguments

This is more compatible and not more complicated.

fate: update pixfmts_hflip

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

lavfi/hflip: support more formats

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

lavfi/geq: improve support for formats with alpha plane

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  vorbisdec: Accept 0 amplitude_bits

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

Merge commit '5b47c19bfda92273ae49e83db26a565afcaed80a'

* commit '5b47c19bfda92273ae49e83db26a565afcaed80a':
  vorbisdec: Add missing checks

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

Merge commit 'fc386f2eea8d93ecd4f81e1646c835d1645c56a0'

* commit 'fc386f2eea8d93ecd4f81e1646c835d1645c56a0':
  vorbisdec: cosmetics

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

Merge commit '11dcecfcca0eca1a571792c4fa3c21fb2cfddddc'

* commit '11dcecfcca0eca1a571792c4fa3c21fb2cfddddc':
  vorbisdec: Error on bark_map_size equal to 0.
  dsputil_alpha.h: Add missing stddef.h header to fix standalone compilation

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

vorbisdec: Accept 0 amplitude_bits

The specification does not prevent an encoder to write the amplitude 0
as 0 amplitude_bits.

Our get_bits() implementation might not support a zero sized read
properly, thus the additional branch.

vorbisdec: Add missing checks

Rate and order must not be 0 even if the specification does not say that
explicitly.

vorbisdec: cosmetics

Use the commonly used "if (!var)" instead of "if (var == 0)".

vorbisdec: Error on bark_map_size equal to 0.

The value is used to calculate output LSP curve and a division by zero
and out of array accesses would occur.

CVE-2013-0894

CC: libav-stable@libav.org
Reported-by: Dale Curtis <dalecurtis@chromium.org>
Found-by: inferno@chromium.org
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

af_biquads: memset(0) cache

Fixes valgrind warnings

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

swr: make the default of nopts for first_pts actually work

Fixes Ticket2210

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

fate: force a first_pts=0 for the aresample test

This is needed to prevent the next commit from breaking fate

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

ffmpeg: Force a first_pts of 0 for the first configuration of -async use

This is very close to what the default does currently

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

ffplay: reindent and remove pointless cast in audio_decode_frame() code

ffplay: set type for channel_layout AudioParams field to int64_t

Reflect the type of the corresponding field in lavc/lavfi.

lavfi/abuffersink: fix weird indent and spacing

lavfi/abuffersink: add sample_rates field to AVABufferSinkParams

Allow to select sample rates.

lavc: change type of AVFrame.channels field from int64_t to int

"channels" is an int in all the other places in the libraries, and the
av_frame_*_channels() accessors return and set an int, so this should not
implicate ABI breaks.

ffmpeg: use a AVDictionary instead of the context to move swr parameters around

This avoids per parameter changes in ffmpeg at the cost of making access
somewhat more annoying.

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

cmdutils: fix null pointer dereference

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

swr: support a seperate output sample bits.

This avoids user apps having to mangle dither scale. for pcm24

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

avfilter/avfiltergraph.h: Move public field out of the private fields

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

swr: add duplicate cutoff for compatibility

Based on
commit 50f4337a2fd3b571b38c9475981e36405d1ca1e1
Author: Justin Ruggles <justin.ruggles@gmail.com>

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

fate: add animated gif decoder tests

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

fate: add animated gif demuxer test

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

mpeg12: Fix non-hwaccel VDPAU decode.

Previously avctx->hwaccel would have been set to a dummy value,
now an explicit check is necessary instead.

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

hls: do not access pb->opaque for custom IO.

As the name indicates we can't just assume what the
"opaque" field contains.
This fixes a crash in third-party applications see e.g.:
http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2126

This fixes also FFmpeg trac #2293, which is a different
third-party application.

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

dsputil_alpha.h: Add missing stddef.h header to fix standalone compilation

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: List external libs used using print_enabled()

Conflicts:
configure

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

Merge commit '3fc09b0081184f26edbb62d2d72ae89bf9e21768'

* commit '3fc09b0081184f26edbb62d2d72ae89bf9e21768':
  configure: Move list of external libs to a separate variable

Conflicts:
configure

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

Merge commit '45235ac488363e3360bf2f2275102d1ec66eba0f'

* commit '45235ac488363e3360bf2f2275102d1ec66eba0f':
  configure: Move x11grab option to a more suitable place in the help output
  lavr: allow setting internal_sample_fmt option by string
  lavr: Add "resample_cutoff" option as a duplicate of "cutoff"

Conflicts:
configure

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

Merge commit '5c7db097ebe1fb5c233cedd8846615074e7d6044'

* commit '5c7db097ebe1fb5c233cedd8846615074e7d6044':
  avconv: pass libavresample options to AVFilterGraph

Conflicts:
cmdutils.c
cmdutils.h
ffmpeg_filter.c
ffmpeg_opt.c

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

Merge commit '9f1223562e134bac6345a465870b9d56ff7d60cf'

* commit '9f1223562e134bac6345a465870b9d56ff7d60cf':
  lavfi: connect libavresample options to af_resample via AVFilterGraph

Conflicts:
doc/APIchanges
libavfilter/avfiltergraph.c
libavfilter/avfiltergraph.h
libavfilter/version.h

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

Merge commit 'd7c450436fcb9d3ecf59884a574e7684183e753d'

* commit 'd7c450436fcb9d3ecf59884a574e7684183e753d':
  ac3dec: validate channel output mode against channel count

Conflicts:
libavcodec/ac3dec.c

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

configure: hwaccel autodetection has been removed in 82ca17ac7a0a08784cb6808384ee237ac28e8334

If you want it back (yeah i want it back too)
then you just need to volunteer to maintain the code in configure
thats related to hwaccel autodetection.

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

configure: Simplify VDPAU header check

Conflicts:

configure

Merge commit '82ca17ac7a0a08784cb6808384ee237ac28e8334'

* commit '82ca17ac7a0a08784cb6808384ee237ac28e8334':
  configure: Fix vaapi/vda/vdpau dependency declarations

Conflicts:
configure

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

Merge commit '215cdd35efd625ec28ef5846f1692b18f7c2c230'

* commit '215cdd35efd625ec28ef5846f1692b18f7c2c230':
  configure: Refactor dxva2api.h dependency declarations

Conflicts:
configure

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

exr: make sure that data_size is not bigger than expected

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

exr: simplify filling channel_buffer[]

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

exr: check color channel subsampling too

If there is unsupported subsampling encountered abort
early instead of failing decoding later.

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

exr: slice threading

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

Merge commit '4cc4b33f71d3982df404fceb4405d656c538bc74'

* commit '4cc4b33f71d3982df404fceb4405d656c538bc74':
  build: Add proper infrastructure for adding and checking host CPPFLAGS

Conflicts:
Makefile
configure

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

Merge commit '2aac411fd4c74e22b978525206f3b8257de1842b'

* commit '2aac411fd4c74e22b978525206f3b8257de1842b':
  configure: Simplify VDPAU header check

Conflicts:
configure

Not merged as the code seems not to work

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

Merge commit '9840130edf3a969ec06dd0faa61dcf8d90c5f67a'

* commit '9840130edf3a969ec06dd0faa61dcf8d90c5f67a':
  configure: Simplify VDA header and extralibs check

Conflicts:
configure

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

Merge commit '0a8da1a3e5f0b9329dfb89d17356ff5444c02351'

* commit '0a8da1a3e5f0b9329dfb89d17356ff5444c02351':
  configure: Do not redundantly list enabled hwaccel libs

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

Merge commit '7432e872066d6960a9fbd31c51a94ebe6183389e'

* commit '7432e872066d6960a9fbd31c51a94ebe6183389e':
  configure: Add print_3_columns helper function and use where appropriate

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

Merge commit '040c565e51985477a8fa5e42d2ddfb26ebde6608'

* commit '040c565e51985477a8fa5e42d2ddfb26ebde6608':
  doc: developer: Allow tabs in the vim configuration for Automake files
  Remove pointless av_cold attributes in header files

Conflicts:
libavcodec/h264.h

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

pnm: use av_pix_fmt_desc_get()

Using the table directly may cause problems on some platforms like msvc

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