avformat/movenc: factor out find_fps()

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

Changelog: add max_error_rate

Suggested-by: Paul B Mahol
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

x86: Fix compilation with nasm on PPC & OS/2

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  x86: h264_idct: Update comments to match 8/10-bit depth optimization split

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

Merge commit '3e2fa991db7ef172579422accd61624d52777e5a'

* commit '3e2fa991db7ef172579422accd61624d52777e5a':
  x86inc: remove misaligned cpu flag

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

Merge commit '71155665414b551ad350622d5abed20e58371fbf'

* commit '71155665414b551ad350622d5abed20e58371fbf':
  x86inc: various minor backports from x264

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

Merge commit '47f9d7ce5493e119e09d1227d017414feaaf8d97'

* commit '47f9d7ce5493e119e09d1227d017414feaaf8d97':
  x86inc: Check for __OUTPUT_FORMAT__ having a value of "x64"

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

Merge commit 'bbe4a6db44f0b55b424a5cc9d3e89cd88e250450'

* commit 'bbe4a6db44f0b55b424a5cc9d3e89cd88e250450':
  x86inc: Utilize the shadow space on 64-bit Windows

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

Merge commit '3fb78e99a04d0ed8db834d813d933eb86c37142a'

* commit '3fb78e99a04d0ed8db834d813d933eb86c37142a':
  x86inc: create xm# and ym#, analagous to m#

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

Merge commit '49ebe3f9fe02174ae7e14548001fd146ed375cc2'

* commit '49ebe3f9fe02174ae7e14548001fd146ed375cc2':
  x86inc: fix some corner cases of SWAP

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

Merge commit '63f0d623100bdb0c6081456127f4b6713e83d3db'

* commit '63f0d623100bdb0c6081456127f4b6713e83d3db':
  x86inc: Use SSE instead of SSE2 for copying data

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

Merge commit 'ad76e6e7e193b98e7335156422d35467816f9ef1'

* commit 'ad76e6e7e193b98e7335156422d35467816f9ef1':
  x86inc: Set ELF hidden visibility for global constants

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

Merge commit 'e52567c2954f627d420b30f75f71af2f2e4afe80'

* commit 'e52567c2954f627d420b30f75f71af2f2e4afe80':
  build: Strip spurious labels

Conflicts:
configure

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

Merge commit '25cb0c1a1e66edacc1667acf6818f524c0997f10'

* commit '25cb0c1a1e66edacc1667acf6818f524c0997f10':
  x86inc: activate REP_RET automatically

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

avcodec/x86/vp9dsp: Fix compilation with nasm.

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

ffmpeg: add max_error_rate to allow tuning the point decoding errors are considered a failure of the whole transcoding.

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

avfilter/vf_deshake: fix block_contrast() lower brightness value

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

x86: h264_idct: Update comments to match 8/10-bit depth optimization split

avfilter/deshake

The old row index looks weird and wrong to me

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

avcodec/options_table: add field_order

This allows setting and overriding the field order

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

avcodec/dpx: support for 8 and 16 bit luma only files

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

avcodec/dpx: refactor pixel format selection

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

avfilter/lswsutils: dont override the default scaler

This should make no difference as this code is only used by removelogo which
seems to refuse to use masks of different size.

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

x86inc: remove misaligned cpu flag

Prevents a crash if the misaligned exception mask bit is
cleared for some reason.

Misaligned SSE functions are only used on AMD Phenom CPUs
and the benefit is miniscule. They also require modifying
the MXCSR control register and by removing those functions
we can get rid of that complexity altogether.

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

x86inc: various minor backports from x264

Small backports that sneaked into other asm commits in x264.

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

x86inc: Check for __OUTPUT_FORMAT__ having a value of "x64"

This is also a valid value for WIN64.

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

x86inc: Utilize the shadow space on 64-bit Windows

Store XMM6 and XMM7 in the shadow space in functions that
clobbers them. This way we don't have to adjust the stack
pointer as often, reducing the number of instructions as
well as code size.

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

x86inc: create xm# and ym#, analagous to m#

For when we want to mix simd sizes within one function.

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

x86inc: fix some corner cases of SWAP

SWAP with >=3 named (rather than numbered) args
PERMUTE followed by SWAP with 2 named args
used to produce the wrong permutation

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

x86inc: Use SSE instead of SSE2 for copying data

Reduces code size because movaps/movups is one byte
shorter than movdqa/movdqu.

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

x86inc: Set ELF hidden visibility for global constants

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

build: Strip spurious labels

The implementation of 25cb0c1a involves lots of spurious labels.

The effect of keeping those labels around is making debugging harder.
Those labels are meaningless, and complicate the disassembly. Also,
gdb can't tell the difference between them and function entry points.

This new strip command is irrelevant to any usage of Libav that would
have used the old fully stripped version, because the old one was for
non-debug use.

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

x86inc: activate REP_RET automatically

Now RET checks whether it immediately follows a branch, so the
programmer dosen't have to keep track of that condition. REP_RET
is still needed manually when it's a branch target, but that's
much rarer.

The implementation involves lots of spurious labels, but that's OK
because we strip them.

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

doc/indevs: make pulse dev formatting consistent with other devices

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>

lavu/parseutils: add more resolutions

See http://en.wikipedia.org/wiki/Graphics_display_resolution

Signed-off-by: Niv Sardi <xaiki@evilgiggle.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  x86: fdct: Employ more specific ifdefs

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

Merge commit '9adbc3f3a1770fec9d24b8f5be3438a6c8e9e6a6'

* commit '9adbc3f3a1770fec9d24b8f5be3438a6c8e9e6a6':
  bmv: Remove unused variable

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

avcodec/dpx: return different error code for unsupported depths

Also give better message in such cases.

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

avfilter/vf_drawtext: remove dead initialization

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

avfilter/vf_phase: remove dead initialization

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

ffmpeg: dont detect slight (0.1sec) backward moving dts as discontinuity

avformat/oggparseflac: fix handling of old flac in ogg

Improves handling of the file in Ticket1617

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

avcodec/flac_parser: export sample_rate also when PARSER_FLAG_COMPLETE_FRAMES is set

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

avcodec/dpx: make .long_name more descriptive

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

avcodec: add dpx parser

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

x86: fdct: Employ more specific ifdefs

This avoids building mmxext and sse2 code when disabled by configure.

bmv: Remove unused variable

configure: filters should select the parts they need not use deps

otherwise enabling the filter would not work if the part hasnt been
enabled by other means already

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

fate: fix dpx on big endian

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

avfilter/vf_scale: dont duplicate default.

use the defaults set by swscale

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  oggparsevorbis: return meaningful errors

Conflicts:
libavformat/oggparsevorbis.c

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

Merge commit '2ddb35b91131115c094d90e04031451023441b4d'

* commit '2ddb35b91131115c094d90e04031451023441b4d':
  x86: dsputil: Separate ff_add_hfyu_median_prediction_cmov from dsputil_mmx

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

Merge commit '6b3ff6f91a535d6383f41ca7bdf760165dcb6015'

* commit '6b3ff6f91a535d6383f41ca7bdf760165dcb6015':
  swscale: provide a default scaler if none is set

Conflicts:
libswscale/utils.c

The default is left at bicubic until someone has compared the scalers
properly speed and quality wise.

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

Merge commit '258414d0771845d20f646ffe4d4e60f22fba217c'

* commit '258414d0771845d20f646ffe4d4e60f22fba217c':
  x86: fdct: Initialize optimized fdct implementations in the standard way

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

Merge commit '0b8b2ae5e93d616c2ece59f7175f483154cff918'

* commit '0b8b2ae5e93d616c2ece59f7175f483154cff918':
  x86: xviddct: Employ more specific ifdefs

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

Merge commit '4272bb6ef1533846a788c259cc498562d0704444'

* commit '4272bb6ef1533846a788c259cc498562d0704444':
  doxy: Document avlog

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

avfilter/vf_scale: change the default scaler to bicubic

See: [FFmpeg-devel] [PATCH] swscale/options: switch default to bicubic
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

swscale/options: switch default to bicubic

Suggested-by: Ronald S. Bultje
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avformat/matroskadec: only set r_frame_rate if the value is within reasonable limits

Fixes Ticket2451

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

oggparsevorbis: return meaningful errors

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

avfilter/f_interleave: use the name 's' for the pointer to the private context

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

x86: dsputil: Separate ff_add_hfyu_median_prediction_cmov from dsputil_mmx

The function does not depend on MMX and compilation without MMX enabled
fails if the function is compiled conditional on MMX availability.

configure: add --tempprefix option

With this and ccache configure execution time goes down from 3.9 to 2.4 seconds

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

swscale: provide a default scaler if none is set

Lanczos for general case, sinc for upscaling, Gaussian for
downscaling. According to current literature these scalers
should be the best quality-wise algorithms for each case.

Inspired from a patch by wm4 <nfxjfg@googlemail.com>

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

x86: fdct: Initialize optimized fdct implementations in the standard way

x86: xviddct: Employ more specific ifdefs

This avoids building mmxext and sse2 code when disabled by configure.

doxy: Document avlog

Provide some information for every function and add a group.

avcodec/dpx: cosmetics: fix identation

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

avcodec/dpx: reformat avpriv_report_missing_feature messages

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

avcodec/dpx: return proper error code for unsupported files

Also use avpriv_report_missing_feature().

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

avfilter/af_silencedetect: support more sample formats

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  ismindex: Change the duration field to int64_t

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

Merge commit '583a287f6f48f263859df142e6f90993e4217c72'

* commit '583a287f6f48f263859df142e6f90993e4217c72':
  ismindex: Calculate the file duration among the included tracks

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

Merge commit 'd347a7b248d4ffdc278373fecf033b0ade030343'

* commit 'd347a7b248d4ffdc278373fecf033b0ade030343':
  ismindex: Use the individual stream duration instead of the global one

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

Merge commit 'b698542ad83284fbb8c22404e3cafeb2dd739d38'

* commit 'b698542ad83284fbb8c22404e3cafeb2dd739d38':
  mov: Don't allocate arrays with av_malloc that will be realloced

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

avcodec/dpx: check packing

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

avcodec/dpx: check encoding

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

avcodec/dpx: fix reading of the packing field

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

avcodec/dpx: fix reading 12bit dpx images, which have non zero padding bits

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

avformat/gifdec: make GIF_APP_EXT_LABEL parsing more robust

Fixes Ticket3021

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

lavd/pulse: add MAINTAINERS entry

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

ismindex: Change the duration field to int64_t

This reduces the risk for overflow in pathlogical cases.

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

ismindex: Calculate the file duration among the included tracks

If the input file contains other tracks (non video/audio) that
aren't included in ismindex, the global file duration as returned
by libavformat might not be equal to the maximum of the duration
of the actual included tracks.

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

ismindex: Use the individual stream duration instead of the global one

The stream duration is used for calculating the duration of the
last fragment easily without manually parsing anything else than
the mfra/tfra atoms. When the global file duration was used
previously, the duration of the last fragment could end up wrong
if the streams weren't equally long.

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

mov: Don't allocate arrays with av_malloc that will be realloced

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

avfilter/vf_histogram: use const for variables that are not supposed to change

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

avformat/mov: force parsing of headers if stts is absent

Fixes Ticket2991

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

lavu/opt: fix doxy for av_opt_get* functions about return value

Success code must be >= 0 and not == 0, consistently with the
implementation.

lavu/common: add warning to GET_UTF8 doxy

Should prevent wrong uses, or at least decrease their chance.

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  x86: fdct: Only build fdct code if encoders have been enabled

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

Merge commit 'cd818b3a5709b9b08bd5901cb8863a8b61be265e'

* commit 'cd818b3a5709b9b08bd5901cb8863a8b61be265e':
  rtmpproto: Validate the embedded flv packet size before copying

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

Merge commit '8921e32f730c191543b84e61338bc9d549aa05a3'

* commit '8921e32f730c191543b84e61338bc9d549aa05a3':
  rtmpproto: Readjust the end of the flv buffer if handle_metadata exited early

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

Merge commit '24fee95321c1463360ba7042d026dae021854360'

* commit '24fee95321c1463360ba7042d026dae021854360':
  rtmpproto: Move the flv header/trailer addition to append_flv_data

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

Merge commit '72540e514ceaaed8ecb97ed63637b2a2a4447ab8'

* commit '72540e514ceaaed8ecb97ed63637b2a2a4447ab8':
  rtmpproto: Clear the flv allocation size on reallocp failures

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

Merge commit '4d6d70292e91a7ef027824d731b6b6570ceabf2f'

* commit '4d6d70292e91a7ef027824d731b6b6570ceabf2f':
  rtmpproto: Pass the 'live' parameter in the right unit

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

Merge commit 'a6b361325f2bfc8d9d4e5f761d6c1a07b209c4fb'

* commit 'a6b361325f2bfc8d9d4e5f761d6c1a07b209c4fb':
  rtmpproto: Print the error code string if there's no description

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

cosmetics: group remaining .name and .long_name.

See b2bed9325.

Merge commit 'b2bed9325dbd6be0da1d91ffed3f513c40274fd2'

* commit 'b2bed9325dbd6be0da1d91ffed3f513c40274fd2':
  cosmetics: Group .name and .long_name together in codec/format declarations

Conflicts:
libavcodec/8svx.c
libavcodec/alac.c
libavcodec/cljr.c
libavcodec/dnxhddec.c
libavcodec/dnxhdenc.c
libavcodec/dpxenc.c
libavcodec/dvdec.c
libavcodec/dvdsubdec.c
libavcodec/dvdsubenc.c
libavcodec/ffv1dec.c
libavcodec/flacdec.c
libavcodec/flvdec.c
libavcodec/fraps.c
libavcodec/frwu.c
libavcodec/g726.c
libavcodec/gif.c
libavcodec/gifdec.c
libavcodec/h261dec.c
libavcodec/h263dec.c
libavcodec/iff.c
libavcodec/imc.c
libavcodec/libopencore-amr.c
libavcodec/libopenjpegdec.c
libavcodec/libopenjpegenc.c
libavcodec/libspeexenc.c
libavcodec/libvo-amrwbenc.c
libavcodec/libvorbisenc.c
libavcodec/libvpxenc.c
libavcodec/libx264.c
libavcodec/libxavs.c
libavcodec/libxvid.c
libavcodec/ljpegenc.c
libavcodec/mjpegbdec.c
libavcodec/mjpegdec.c
libavcodec/mpeg12dec.c
libavcodec/mpeg4videodec.c
libavcodec/msmpeg4dec.c
libavcodec/pgssubdec.c
libavcodec/pngdec.c
libavcodec/pngenc.c
libavcodec/proresdec_lgpl.c
libavcodec/proresenc_kostya.c
libavcodec/ra144enc.c
libavcodec/rawdec.c
libavcodec/rv10.c
libavcodec/sp5xdec.c
libavcodec/takdec.c
libavcodec/tta.c
libavcodec/v210dec.c
libavcodec/vp6.c
libavcodec/wavpack.c
libavcodec/xbmenc.c
libavcodec/yop.c

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

Merge commit '49fe9c05f97bc2cfafd8fdcfea2f313d7c8e2c48'

* commit '49fe9c05f97bc2cfafd8fdcfea2f313d7c8e2c48':
  oggparsevorbis: K&R formatting cosmetics

Conflicts:
libavformat/oggparsevorbis.c

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

Merge commit '47b6cfc2a0333fb24f074d27830bf35ae5007050'

* commit '47b6cfc2a0333fb24f074d27830bf35ae5007050':
  avformat/output-example: Declare link dependency on libswscale in the Makefile

Conflicts:
libavformat/Makefile

Changes to libavformat/Makefile are not merged as our build system for the examples
is different.

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