Merge commit '636ced8e1dc8248a1353b416240b93d70ad03edb'

* commit '636ced8e1dc8248a1353b416240b93d70ad03edb':
  cmdutils: wrap exit explicitly

Conflicts:
avprobe.c
cmdutils.c
ffmpeg.c

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

Merge commit '21732063a346475eb22c332b27e8216b79f9ad4a'

* commit '21732063a346475eb22c332b27e8216b79f9ad4a':
  movenc: K&R formatting cosmetics

Conflicts:
libavformat/movenc.c

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

Merge commit '38e9585de993c32899588ab037180f2c930ce74c'

* commit '38e9585de993c32899588ab037180f2c930ce74c':
  Makefile: Remove stray tabs
  vp8: Wait for prev_frame to parse segment_map before reading it
  yuv4mpeg: Correctly round chroma up for odd luma sizes
  rmdec: Use the AVIOContext given as parameter in rm_read_metadata()
  avio: Handle AVERROR_EOF in the same way as the return value 0

Conflicts:
libavformat/rmdec.c
libavformat/yuv4mpeg.c

No change as all the commits where already in before

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

avformat_find_stream_info: fallback to timestamps in analyzeduration check in more cases

This fixes speex in rtmp
Fixes Ticket2409

the nellymoser in flv case actually needs larger analyzeduration. The code
previously just failed to calculate the duration

If this causes any problems, like premature analyze/probe end, please report!

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

zmbvenc: remove unused AVFrame from encoder private context

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

zmbvenc: do not set avctx->coded_frame

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

gif: remove unused AVFrame from encoder private context

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

gif: do not set avctx->coded_frame

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

cmdutils: wrap exit explicitly

Some C runtime implementations deadlock when calling threading functions
on the atexit() handler.

Use a simpler wrapper similar to av_log to call the cleanup function
before exit.

Bug-Id: 523

movenc: K&R formatting cosmetics

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

Makefile: Remove stray tabs

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

vp8: Wait for prev_frame to parse segment_map before reading it

This fixes occasional failures of vp8-test-vector-010 with frame-level
multithreading enabled.

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

yuv4mpeg: Correctly round chroma up for odd luma sizes

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

rmdec: Use the AVIOContext given as parameter in rm_read_metadata()

This fixes crashes when playing back certain RealRTSP streams.

When invoked from the RTP depacketizer, the full realmedia
demuxer isn't invoked, but only certain functions from it, where
a separate AVIOContext is passed in as parameter (for the buffer
containing the data to parse). The functions called from within
those entry points should only be using that parameter, not
s->pb. In the depacketizer case, s is the RTSP context, where ->pb
is null.

Cc: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>

avio: Handle AVERROR_EOF in the same way as the return value 0

This makes sure the ffurl_read_complete function actually
returns the number of bytes read, as the documentation of the
function says, even if the underlying protocol uses AVERROR_EOF
instead of 0.

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

wtv: Mark attachment with a negative stream id

A sid 0 would be mismatched to the attachment.

Prevent NULL pointer dereference.

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

avprobe: rename the prettyprint structures

dxa: make code independent of sizeof(AVFrame)

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

mmsh: reimplement seeking

Fixes Ticket2682

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

avformat_find_stream_info: use fps_dts as last resort to determine duration

Fixes long delay with some hardware generated h264 in ts

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

avformat/mp3dec: read TOC even if not all needed information is available

This fixes hyothetical bugs with parsing of elements after the TOC

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

avformat/mp3dec: read xing toc independant of usetoc, only skip filling index if requested

Fixes hypothetical parsing bug with -usetoc 0

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

avformat/Makefile: remove stray tab

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  wtv: Mark attachment with a negative stream id

Conflicts:
libavformat/wtv.c

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

Merge commit 'a4baf96abd64cda68e3e4692b182bdf60745a14d'

* commit 'a4baf96abd64cda68e3e4692b182bdf60745a14d':
  avprobe: rename the prettyprint structures
  tools: Wording and formatting cosmetics

Conflicts:
avprobe.c

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

Merge commit '6516632967da5e6bd7d6136e8678f826669ed26e'

* commit '6516632967da5e6bd7d6136e8678f826669ed26e':
  tests: Only run noproxy test if networking is enabled
  fifo: K&R formatting cosmetics

Conflicts:
libavformat/Makefile
libavutil/fifo.c

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

Merge commit '4e7f0b082d8c4b360312216b9241bec65ff63b35'

* commit '4e7f0b082d8c4b360312216b9241bec65ff63b35':
  kmvc: Clip pixel position to valid range

The added clip should make no difference, there are already checks for
the index.

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

Merge commit '8f689770548c86151071ef976cf9b6998ba21c2a'

* commit '8f689770548c86151071ef976cf9b6998ba21c2a':
  kmvc: use fixed sized arrays in the context

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

avformat/mov: Fix duration of fragmented mov

Fixes Ticket2757

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

dct_unquantize_h263_intra_c: fix assert condition

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

libavcodec/x86/mpegvideo: Move mmx functions under HAVE_MMX_INLINE

should fix ticket2755

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

avcodec/x86/vp3dsp_init: move mmx functions under HAVE_MMX_INLINE

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

oggparseskeleton: avoid header parsing failure

Based on description by James Almer and the xiph wiki

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

nutdec: use ff_find_last_ts()

Fixes finding the duration for nut files that are truncated

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

avformat/utils: factor ff_find_last_ts() out of ff_gen_search()

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

tools: Wording and formatting cosmetics

tests: Only run noproxy test if networking is enabled

fifo: K&R formatting cosmetics

kmvc: Clip pixel position to valid range

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

kmvc: use fixed sized arrays in the context

Avoid some boilerplate code to dynamically allocate and then free the
buffers.

replace some deprecated defines

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

lavfi/blend: use dual input helpers

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

avcodec/x86/cabac: Disable get_cabac_bypass_x86() on broken llvm/clang

This should fix fate on these platforms

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

avcodec/x86/cabac: factorize broken llvm/clang check out

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

oggparseskeleton: Replace avpriv_report_missing_feature() with a normal av_log() call

since there should not be more than one fisbone for a given stream.

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

oggparseskeleton: Fix fisbone header parsing

start_granule should be applied to the stream referenced in the fisbone packet, not to the
Skeleton stream.
This was broken in d1f05dd18375f2f8e68372edee11436927e43ba8 and produced bogus warnings about
multiple fisbone in the same stream on files with more than one stream.

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

examples/muxing: add support to audio resampling

Allows to encode to output in case the destination sample format is
different from AV_SAMPLE_FMT_S16.

doc/encoders: add libopus encoder doc

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  bitstream_filter: K&R formatting cosmetics

Conflicts:
libavcodec/bitstream_filter.c

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

avformat/mp3dec: Add usetoc option to allow dlsabling the use of the xing TOC

The toc is inexact and not using it can thus make sense.
Using it is faster though, thus the opposite can similarly makes sense

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

tcp: Use a default timeout of 5 sec for opening a connection but not for receiving packets

This should be closer to how tcp behaved longer ago and should
fix the issue with idle connections timing out.

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

ff_network_wait_fd_timeout: do not break with timeout < 0

Most code treats timeout < 0 like 0 already

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

tcp: Fix the default timeout

Fixes Ticket2694

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

avformat/avidec: Fix incorrect detection of badly interleaved avi

The method guess_ni_flag needs to divide timestamps in the index
by sample_size if it is set in order to compare different streams correctly.

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

ADPCM IMA WAV 2, 3 and 5 bits decoder

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

bitstream_filter: K&R formatting cosmetics

get_bits: add get_bits_le()

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

lavfi/delogo: band width must be at least 1

We need at least one pixel around the logo to use as known points to
interpolate from. So properly declare the band/t attribute has having
a minimum value of 1.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

lavfi/delogo: option show shouldn't affect band

Options "show" and "band" are unrelated and should thus be
independent. However, setting "show" to 1 currently resets "band" to
its default value of 4. While this is documented, this still
surprising and confusing IMHO.

Change this behavior and make "show" and "band" independent from each
other. Update the documentation accordingly.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

lavfi/blackdetect: support 2 more pixels formats

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

lavfi/cropdetect: export cropdetect info to frame metadata

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

lavfi/delogo: remember left and right samples when interpolating

The left and right samples are the same for the whole line, so store
their values and don't recompute them for every iteration of "y".

This simple optimization results in a speed improvement between 15%
and 20% in my tests (depending on the logo geometry.)

Result is obviously the same.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

lavfi/delogo: don't recompute the same difference again and again

The top left hand corner pixel coordinates are already stored in
logo_x1 and logo_y1 so don't recompute each of them 6 times for every
iteration.

This is a simple code optimization, result is obviously the same. The
performance gain is small (about 2% in my tests) but still good to
have, and the new code is clearer.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Reviewed-by; Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

libavcodec: use 64bit counter in deprecated audio encoder API to prevent problems regarding negative dts

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  compat: wrap math.h to avoid AIX-specific clashes

Conflicts:
configure

See: bf18abb2eb79c00c69f6f83ede64536e3297793c, 0915b531bc62440914710d2989813563b0446c5e

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

Merge commit '0420c810ceb430003f9f2793c5cfa1fe84657f3d'

* commit '0420c810ceb430003f9f2793c5cfa1fe84657f3d':
  log: pass the correct parameters to missing_feature_sample

Conflicts:
libavutil/log.c

See: 572e38a513139b21c35acfef13aa7c4e307ab648

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

doc/filters: clarify documentation for overlay repeatlast option

Suggested-By: Oliver Fromme <oliver@fromme.com>

Merge commit '6a10142faa1cca8ba2bfe51b970754f62d60f320'

* commit '6a10142faa1cca8ba2bfe51b970754f62d60f320':
  indeo: reject negative array indexes

Conflicts:
libavcodec/ivi_common.c

See: 93927eb334dce961603645dd4ed9772bb2400cc4, a93c7ca6ef625188c9ec088c2e75f731b78c9923

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

Merge commit '6dfacd7ab126aea1392949d1aa10fdc3d3eeb911'

* commit '6dfacd7ab126aea1392949d1aa10fdc3d3eeb911':
  indeo: Cosmetic formatting

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

Merge commit '62256010e9bc8879e2bf7f3b94af8ff85e239082'

* commit '62256010e9bc8879e2bf7f3b94af8ff85e239082':
  indeo: Refactor ff_ivi_init_tiles and ivi_decode_blocks

Conflicts:
libavcodec/ivi_common.c

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

Merge commit 'f6f36ca8ca1b2526d3abff7d7c627322d3bce912'

* commit 'f6f36ca8ca1b2526d3abff7d7c627322d3bce912':
  indeo: Refactor ff_ivi_dec_huff_desc

Conflicts:
libavcodec/ivi_common.c

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

Merge commit 'e6d8acf6a8fba4743eb56eabe72a741d1bbee3cb'

* commit 'e6d8acf6a8fba4743eb56eabe72a741d1bbee3cb':
  indeo: use a typedef for the mc function pointer
  cabac: x86 version of get_cabac_bypass
  aic: use chroma scan tables while decoding luma component in progressive mode

Conflicts:
libavcodec/aic.c

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

lavc/avcodec.h: document bitstream filter API

mpegts: only reopen pmt_cb filter if its different from the previous.

Fixes Ticket2632

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

lavf: fix documentation for avoid_negative_ts

Prefer "non-negative" over "positive", the former is more accurate.

lavc/bitstream_filter: do not crash in case the argument of av_bitstream_filter_close() is NULL

avutil/rational: avoid llrint() and rint()

This should workaround issues with these functions on ia64 and sparc64

Fixes Ticket2713

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

avformat/movenc: allow negative TS for the ipod muxer

Fixes Ticket2708

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

configure: fix webp decoder dependency

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

avcodec/svq1enc: fix frame rotation code

Fixes Ticket2747

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

libstagefright: port to refcounted frames

Untested.

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

libstagefright: unbreak compilation

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

compat: wrap math.h to avoid AIX-specific clashes

AIX defines a class() function in its math.h header without any
guard.

log: pass the correct parameters to missing_feature_sample

CC:libav-stable@libav.org

lavf/movenc: check ff_mov_init_hinting() return

Fixes a crash when the codec stream is not supported by the rtp muxer.

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

mpegts: use ffio_ensure_seekback()

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

avformat/aviobuf: Add ffio_ensure_seekback()

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

avformat: Append data in fill_buffer() when possible

Data is appended in fill_buffer() when there is sufficient space left
and the data pointer only reset when needed.
Previously the data pointer was more often reset, loosing more seekback
space than otherwise needed.

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

Rename "AVClass class" as "AVClass component_class" for external codecs.

The aix header math.h defines "extern int class()" for C.
This fixes compilation on aix with external libraries enabled.

Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>

Fix opacity and increase colour dynamics of initial vmd palette.

avformat/http: support relative url redirection

see also http://tools.ietf.org/html/draft-ietf-httpbis-p2-semantics-17#section-9.5

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

indeo: reject negative array indexes

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

indeo: Cosmetic formatting

Trim some overly long lines.

indeo: Refactor ff_ivi_init_tiles and ivi_decode_blocks

Spin large and mostly self contained blocks into stand alone
functions.

indeo: Refactor ff_ivi_dec_huff_desc

Spare an indentation level.

indeo: use a typedef for the mc function pointer

cabac: x86 version of get_cabac_bypass

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

lavfi/crop: support more pixel formats

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

avcodec/sonic: Fix usage of init_get_bits() and use init_get_bits8()

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

avformat/h261dec: use init_get_bits8()

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