Merge commit 'e57c4706e969afa1f2384481b955ccd9494cddb5'

* commit 'e57c4706e969afa1f2384481b955ccd9494cddb5':
  lavc: don't reuse audio buffers

This commit causes a 0.5% speedloss for mp3 and 2% for raw pcm, that is
"time ffmpeg" style tested thus includes disk IO, demux and parsing

I would not have merged it if it wasnt required for the "new" buffer API
but sadly it is.
Once the new API is in ill reimplement proper buffer reuse, which will
fix this speedloss. In case we choose not to merge the "new" buffer
API then this commit here should be reverted.

Conflicts:
libavcodec/internal.h
libavcodec/utils.c

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

lavc: move ff_init_buffer_info() down to ff_get_buffer()

and remove redundant code from ff_get_buffer()

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

Merge commit 'ff953fecffd3b9a616a046723fb9d4690be032a6'

* commit 'ff953fecffd3b9a616a046723fb9d4690be032a6':
  lavc: set frame properties in ff_get_buffer().

Conflicts:
libavcodec/utils.c

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

Merge commit '594d4d5df3c70404168701dd5c90b7e6e5587793'

* commit '594d4d5df3c70404168701dd5c90b7e6e5587793':
  lavc: add a wrapper for AVCodecContext.get_buffer().

Conflicts:
libavcodec/4xm.c
libavcodec/8svx.c
libavcodec/bmv.c
libavcodec/cljr.c
libavcodec/cscd.c
libavcodec/dnxhddec.c
libavcodec/dpcm.c
libavcodec/dpx.c
libavcodec/eacmv.c
libavcodec/eamad.c
libavcodec/frwu.c
libavcodec/g723_1.c
libavcodec/gifdec.c
libavcodec/idcinvideo.c
libavcodec/iff.c
libavcodec/indeo3.c
libavcodec/internal.h
libavcodec/interplayvideo.c
libavcodec/kmvc.c
libavcodec/mpc7.c
libavcodec/mpegaudiodec.c
libavcodec/pcx.c
libavcodec/pngdec.c
libavcodec/pnmdec.c
libavcodec/rl2.c
libavcodec/snow.c
libavcodec/targa.c
libavcodec/tscc.c
libavcodec/txd.c
libavcodec/utils.c
libavcodec/v210dec.c
libavcodec/vb.c
libavcodec/vmdav.c
libavcodec/vp56.c
libavcodec/vqavideo.c
libavcodec/wavpack.c
libavcodec/wnv1.c
libavcodec/xl.c
libavcodec/yop.c

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

ircamenc: 10l do not use avio_skip()

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

Ensoniq Paris Audio File demuxer

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

IRCAM demuxer & muxer

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

rsodec: use ff_pcm_read_packet()

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

soxdec: use ff_pcm_read_packet()

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

audec: use ff_pcm_read_packet()

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

pvfdec: use ff_pcm_read_packet()

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

avr: use ff_pcm_read_packet()

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

pcmdec: move read_packet function to pcm.c so it can be shared with other demuxers

While here remove pts/dts code, it is apparently not needed and cause
problems for demuxers that will use such function.

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

Merge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967'

* commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967':
  Remove pointless #undefs of previously forbidden functions.
  fate: Add dependencies for bmp, cdxl, dfa, mp3

Conflicts:
doc/examples/muxing.c
libavfilter/filtfmts.c
libavutil/des.c
libavutil/eval.c
libavutil/log.c
libavutil/parseutils.c
tests/fate/mp3.mak

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

fate: disable vf_gradfun test

The non working test interferes with other peoples work

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

vc1dec: Fix null pointer dereference in vc1_decode_skip_blocks()

This handles the last frame being unavailable like all the other
code in vc1dec.

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

lavc/dvdsubdec: accept palette from options.

On DVDs, the palette is part of the IFO file and therefore
not available when reading from a dumped VOB file.

oggdec: prevent codec from changing through ogg_replace_stream()

This prevents inconsistencies leading to out of array accesses.

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

ff_emulated_edge_mc: fix handling of w/h being 0

Fixes assertion failure

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

pixdesc: fix broken yuva definitions

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

ffv1enc: allow encoding with 1 slice for CIF and smaller in version 3

the default is still 4 slices for any resolution, this just allows the user
to force 1 slice.
This in my quick test improves compression by 1% for a 320x240 sample

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

Set some audio stream properties in the vivo demuxer.

This allows playback with MPlayer and the binary decoder.

Reviewed-by: Paul B Mahol

fate: add gradfun filter test.

fate: add hqdn3d filter test.

lavfi/subtitles: 10l close codec before format.

Fix invalid memory accesses.

lavc: don't reuse audio buffers

Any performance gain from this is negligible and not worth the extra
code.

lavc: set frame properties in ff_get_buffer().

There is no point in duplicating this code in every get_buffer()
implementation.

lavc: add a wrapper for AVCodecContext.get_buffer().

It will be useful in the upcoming transition to refcounted AVFrames.

Remove pointless #undefs of previously forbidden functions.

lavf: compute probe buffer size more reliably.

The previous code computes the offset by reversing the growth
of the allocated buffer size: it is complex and did lead to
inconsistencies when the size limit is reached.

Fix trac ticket #1991.

lavfi/drawtext: add the reload option.

lavf: the core rfps code needs 2 durations to estimate rfps

This fixes a regression where this count became 1 with
HPM-GC\ EXPORT\ FCP-1A-AVCI100-1080i25-001.mxf

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

av_register_protocol is gone :(

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

rawvideodec: set bit rate

Fixes #1989.

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

ffmpeg: small indent fix.

ffmpeg: use the correct variables in do_video_stats()

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

Update video stats log during encode flush

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

gifdec: do not handle timestamps

It is broken, and results will be messed up when seeking.

This also fix duration displayed for streams when using -c copy.

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

Add debug output when skipping unknown swf tags.

Reviewed-by: Clément Bœsch

fate: Add dependencies for bmp, cdxl, dfa, mp3

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  ppc: always use pic for shared libraries
  build: cosmetics: Move CONFIG_RTPDEC entry to a more suitable place
  fate: ea, h264: prettyprinting and ordering cosmetics

Conflicts:
tests/fate/ea.mak
tests/fate/h264.mak

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

auenc: remove pointless assigment

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

mmf: return meaningful error codes

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

AST Muxer

Signed-off-by: James Almer <jamrial@gmail.com>

ast: Rename ast.c -> astdec.c

Signed-off-by: James Almer <jamrial@gmail.com>

iff demuxer: include DEEP TVDC lookup table in extradata buffer

Signed-off-by: Peter Ross <pross@xvid.org>

iff decoder: DEEP TVDC 32-bit decoder

Signed-off-by: Peter Ross <pross@xvid.org>

configure: Fix ARM thumb detection

The detection detects the default but not if it even works.
Check building a simple piece of code and disable thumb if it fails
This fixes a compile failure

If someone has a better idea, just replace this by it!

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

matroskadec: reset size when freeing data.

Fixes null pointer dereference

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

lavfi/mp: fix invalid read with filters with no argument.

lavfi/removelogo: switch to ff_filter_frame.

lavfi: add subtitles filter.

ppc: always use pic for shared libraries

CC: libav-stable@libav.org

lavfi: remove some video w/h settings after avfilter_copy_buffer_ref_props.

video->[wh] will be set with the same values as the input after
avfilter_copy_buffer_ref_props. These filters don't change the size of
the input so there is no need for this code.

lavfi/gradfun: remove check for AV_PERM_PRESERVE.

This check does not make sense in this context, see
doc/filter_design.txt for details about the usage of such flag.

libspeex: allow custom sample rates again.

This was broken by 3b061c5e10f78caaf3b2a45cf7a92e50d4d20bfb
Fixes trac issue #1974.

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

build: cosmetics: Move CONFIG_RTPDEC entry to a more suitable place

mpegts: check that codec is not open in mpegts_find_stream_type

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

mpegts_set_stream_info: remove unneeded codec id check

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

ff_mp4_read_dec_config_descr: check that the codec is not open

Fixes out of array accesses

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

doc: describe micro versioning policy

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

takdec: add .sample_fmts

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

shorten: update .sample_fmts

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

fate: ea, h264: prettyprinting and ordering cosmetics

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: Strip ordinals from mingw generated def files
  configure: arm: detect default thumb state of compiler

Conflicts:
configure

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

lswr/swresample: use AV_OPT_TYPE_SAMPLE_FMT for sample format options

Improve usability and robustness.

configure: Strip ordinals from mingw generated def files

The def files are used for generating import libraries for
other toolchains (in particular, for generating import libraries
for MSVC for DLLs built with mingw).

The def files produced by mingw/gcc contains ordinals for each
exported function. When MSVC tools generate import libraries
from such a def file, MSVC links to the DLL by the ordinals
instead of linking by name.

Since the def files aren't maintained by hand, the ordinal
numbers are assigned (more or less) randomly and any caller
linking to the libs by ordinals will break as soon as the libraries
export more/fewer functions.

Therefore, strip out the ordinals from the generated def files,
to make users link to the libraries by name.

Callers linking to the DLLs using the gcc provided import library
link by name as they should.

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

configure: arm: detect default thumb state of compiler

This makes configure honour the compiler default if thumb is not
explicitly enabled or disabled.

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

ra144enc: reject unsupported sample rates

fate: fix typos in wtv seek test

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  fate: fft: Fix libavcodec dependency
  build: Make the ISMV muxer select the MOV muxer
  configure: move arm arch extensions to a separate variable

Conflicts:
configure

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

Merge commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6'

* commit 'e816034a5fa131b13c4ad87bb0b5065b4f5697c6':
  fate-seek: remove use of gnu make 3.82 only private modifier
  fate: move vsynth reference files to their own directory
  fate: move fate-acodec reference files to their own dir
  configure: avplay now depends on avresample
  fate: split dependencies for fate-seek tests

Conflicts:
configure
tests/fate/seek.mak

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

Merge commit '0b300daad2f5cb59a7c06dde5ac701685e6edf16'

* commit '0b300daad2f5cb59a7c06dde5ac701685e6edf16':
  h264: error out on unset current_picture_ptr for h->current_slice > 0
  avprobe: report per stream bit rate if set by the decoder
  aac: avoid a memcpy in sbr_qmf_analysis

Conflicts:
avprobe.c

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

vp56: Ignore reconfiguration from the alpha plane.

Fixes out of array reads

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

fate: fft: Fix libavcodec dependency

build: Make the ISMV muxer select the MOV muxer

They share the same code, so building one w/o the other makes no sense.

configure: move arm arch extensions to a separate variable

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

fate-seek: remove use of gnu make 3.82 only private modifier

fate: move vsynth reference files to their own directory

fate: move fate-acodec reference files to their own dir

configure: avplay now depends on avresample

fate: split dependencies for fate-seek tests

Each fate-seek test depends now only on the corresponding fate-acodec,
fate-vsynth2 or fate-lavf test which creates the file seek-tests
operates on. The tests and references are renamed to match the test they
depend on.

h264: error out on unset current_picture_ptr for h->current_slice > 0

Fixes a segfault with fuzzed sample sample_varPAR_s11622_r001-02.avi.

CC: libav-stable@libav.org

avprobe: report per stream bit rate if set by the decoder

wtvdec: fix null pointer dereference

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

aac: avoid a memcpy in sbr_qmf_analysis

Swapping buffer indices allows saving one memcpy that accounts for 1% of the
runtime, according to oprofile.

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

asfdec: check extradata size before alloc and read

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

h264: check for integer overflow, fix null pointer dereference

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

lavu/channel_layout: document the semantic of layouts.

lavfi/bbox: switch to ff_filter_frame() API

lavfi/alphamerge: fix leak introduced in 217163eb

gifdec: read pixel aspect ratio

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

lavfi/vf_super2xsai: fix output ref size.

lavfi/framestep: switch to ff_filter_frame API

lavfi/super2xsai: switch to ff_filter_frame() API

lavfi/hue: move to ff_filter_frame.

fate: add hue filter test.

lavfi/vf_tile: forward errors.

lavfi/vf_tile: cosmetic after last commit.

lavfi/vf_tile: switch to filter_frame.

Also add error check on buffer allocation.