Add examples/resampling_audio to .gitignore.

doc/decoders: fix typo in "@Options"

examples: add resampling_audio.c file

h264: slice-mt: check master context for valid current_picture_ptr

Fixes errors in slice based multithreading introduced in 0b300daad2f5.

h264: slice-mt: get last_pic_dropable from master context

Fixes fate-h264-conformance-cvnlfi2_sony_h and smllwebdl.mkv from
https://github.com/OpenELEC/OpenELEC.tv/issues/1557 .

ff_lock_avcodec: make the lock state be consistent in case of failure.

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

avcodec_open: if obtaining a lock fails, dont attempt to unlock it.

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

Revert "Acquire lock when initializing parsers."

This reverts commit 7feef7dbca5f6a816e04b63c17aad5dacd272f6e.

This commit causes assertion failures due to use of parser_init from multiple
threads, for example indirectly by ffmpeg.c and more directly from the
packet read functions.

I dont know how to fix this quickly, and fixing ffmpeg.c leaves
the possibility of other applications being affected.
Crashing the applications until this is resolved is clearly no good
thus this revert, so we have time to think about the problem.

Crashes can be reproduced by using multiple input files in ffmpeg.

Revert "Add assert that the avcodec lock is held when initializing static VLC tables."

This reverts commit dd154198b1afa9f3f740eb0b2ccd7ab665f8edd4.

frame_thread_encoder: fix locking while locks are held

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

vc1dec: prevent v_edge_pos from becoming negative.

Fixes assertion failure

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

resample: remove disabled debug code

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

fate/hqdn3d: add -idct simple.

This should fix FATE failure on ARM. IDCT is required since it's a JPEG
source.

swr: remove unused ONE define.

cafenc: do not include riff.h

ff_codec_get_tag() was moved to internal.h

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

lavc/dxa: return meaningful error codes

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

lavf/dxa: return meaningful error codes

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

dxa: signal EOF

Fixes #1948.

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

Add assert that the avcodec lock is held when initializing static VLC tables.

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

Acquire lock when initializing parsers.

This is necessary since they might be initializing or
even using static VLC tables.

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

avcodec: add ff_lock/unlock_avcodec functions.

Will be used in future patches, together with the
variable that allows checking whether the lock is held.

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

wmaenc: add new line to some error messages

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

mpegvideo_parser: fix buffer access beyond end

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

av_assert should use AV_LOG_PANIC.

The description of AV_LOG_PANIC 100% matches what av_assert
does, while AV_LOG_FATAL does not really.

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

mpegvideo_enc: use av_log() in debug code

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

motion_est: use av_log() in debug code

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

j2kenc: remove duplicate debug functions

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

j2k: avoid printf() useage in debug code

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

mpegvideo: remove #if/define PARANOID code

This code never did anything as far as i can remember

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

lavc: fix decode_frame() third parameter semantics for rest of video decoders

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  fate: workaround for slighly broken 'test' shell builtin
  mimic: initialize padding of swap_buf through av_fast_padded_malloc
  eamad: initialize padding of bitstream_buf through av_fast_padded_malloc()
  raw demuxer: initialize end of partial packets

Conflicts:
tests/fate-run.sh

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

Merge commit 'df9b9567518f2840d79a4a96b447ebe1aa326408'

* commit 'df9b9567518f2840d79a4a96b447ebe1aa326408':
  lavc: fix decode_frame() third parameter semantics for video decoders

Conflicts:
libavcodec/cscd.c
libavcodec/eamad.c
libavcodec/ffv1dec.c
libavcodec/gifdec.c
libavcodec/h264.c
libavcodec/iff.c
libavcodec/mjpegdec.c
libavcodec/pcx.c
libavcodec/vp56.c

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

Merge commit '387bef95d28019c13c6805cfa4079e59948284e5'

* commit '387bef95d28019c13c6805cfa4079e59948284e5':
  lavc: factorise setting buffer type in avcodec_default_get_buffer().

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

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: workaround for slighly broken 'test' shell builtin

Some shells, e.g. minix3, have a broken 'test' builtin which fails
if the first operand of a binary operator looks like a unary operator.
Prefixing the values with 'x' prevents this from happening.

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

mimic: initialize padding of swap_buf through av_fast_padded_malloc

eamad: initialize padding of bitstream_buf through av_fast_padded_malloc()

raw demuxer: initialize end of partial packets

fate: add gradfun filter test.

fate: add hqdn3d filter test.

lavfi/subtitles: 10l close codec before format.

Fix invalid memory accesses.

lavc: fix decode_frame() third parameter semantics for video decoders

It's got_frame, not data size

lavc: factorise setting buffer type in avcodec_default_get_buffer().

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>