avfiltergraph: add aresample_swr_opts

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

lavu: drop time redefinition as it causes some problems in some uncommon configurations.

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  remove #defines to prevent use of discouraged external functions
  x86: h264: Convert 8-bit QPEL inline assembly to YASM

Conflicts:
libavcodec/x86/dsputil_mmx.c

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

adpcm/thp: make use of ADPCMChannelStatus to store prev samples

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

Merge commit 'ad01ba6ceaea7d71c4b9887795523438689b5a96'

* commit 'ad01ba6ceaea7d71c4b9887795523438689b5a96':
  x86: h264: Remove 3dnow QPEL code

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

Merge commit '28c8e288fa0342fdef532a7522a4707bebf831cc'

* commit '28c8e288fa0342fdef532a7522a4707bebf831cc':
  x86: h264_chromamc: port to cpuflags
  yop: fix typo
  avconv: fix copying per-stream metadata.
  doc: avtools-common-opts: Fix terminology concerning metric prefixes
  configure: suncc: Add compiler arch support for Nehalem & Sandy Bridge
  riff: Make ff_riff_tags static and move under appropriate #ifdef

Conflicts:
libavformat/riff.c

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

lavu/samplefmt: return the size of the allocated samples buffer at the next bump

Make the functions av_samples_fill_arrays, av_samples_alloc, and
avcodec_fill_audio_frame return a buffer size rather than 0 in case of
success. This will be enabled at the next libavutil major bump, in order
to preserve backward compatibility.

Returning the size allows to simplify the code, avoiding a few function
calls.

doc/encoders: add a note for x264 options that use colon

Signed-off-by: Ivan Pozdeev <ivan_pozdeev@mail.ru>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>

Support switching field order when decoding frwu.

The binary encoder has a "switch field order" setting that
moves one line from the top to the bottom of the frame.

Fixes ticket #966.

remove #defines to prevent use of discouraged external functions

Preventing the use of discouraged or 'insecure' external functions
through defines in an internal header is not a good solution. The
header is not guaranteed to be included universally which makes
overlooking bad use of said functions during review more likely.

There are cases were those functions either are the most straight
forward solution or even have to be used. Using malloc or free is
required if the allocation or release is done by other libraries.

imc: flush decoder

Fixes Ticket1899

Based on code by ami_stuff
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

tga: check palette size earlier.

Fixes Ticket1895

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

x86: h264: Convert 8-bit QPEL inline assembly to YASM

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

lavc/utils: check return value of avcodec_fill_audio_frame() for < 0

Assume that the value is always negative in case of error, as stated in
the docs, do not assume that the value cannot be != 0 in case of success.

x86: h264: Remove 3dnow QPEL code

The only CPUs that have 3dnow and don't have mmxext are 12 years old.
Moreover, AMD has dropped 3dnow extensions from newer CPUs.

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

lavu/opt: add support for reading pixel and sample format through av_get_int()

Simplify backward compatibility, when switching from AV_OPT_TYPE_INT to
AV_OPT_TYPE_SAMPLE/PIXEL_FMT.

doc: add libswscale.texi and ffmpeg-scaler.texi files

mpsmpeg4: use av_image_check_size

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

avrndec: use av_image_check_size

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

rawdec: use av_image_check_size

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

lavu/imgutils: add consistency checks to av_image_copy_plane()

Add assertions and abort in case of invalid |dst_linesize| < bytewidth or
|src_linesize| < bytewidth.

Avoid to silently corrupt memory.

x86: h264_chromamc: port to cpuflags

yop: fix typo

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>

avconv: fix copying per-stream metadata.

It is handled separately from other types because it uses stream
specifiers and currently that triggers an assert in SET_DICT.

CC:libav-stable@libav.org

lavu/opt: fix range shown in set_format() log message

configure: prefer "resampling" in the libswresample pkg-config description

lavu/opt: add av_opt_ accessors for pixel/format/image size options

The interface is implemented against the style of the other options
accessors. Possibly simplify programmatic setting of options.

iff decoder: initialise HAM line decoder with first palette entry

The palette is organised into 'hold' and 'modify' pairs, hence why
the first palette entry is pal[1].

Fixes ticket #1701.

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

avfiltergraph: add AVOption table

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

doc: avtools-common-opts: Fix terminology concerning metric prefixes

'k', 'M', and 'G' are SI (unit) prefixes or metric prefixes,
not 'number postfixes'. Also, the statement regarding binary
prefixes ("powers of 2 are used instead of powers of 10")
might be misinterpreted (1 kB = 10^3 B, but 1 KiB != 2^3 B).

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

configure: suncc: Add compiler arch support for Nehalem & Sandy Bridge

GCC does not appear to have a -march= string for Westmere, which is a
bit surprising as it has a few more instructions than a Nehalem, but
a few less than a Sandy Bridge.

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

riff: Make ff_riff_tags static and move under appropriate #ifdef

The table is not used outside the file.

smacker: fix smacker_decode_header_tree() empty vlc table init

Fixes Ticket1858

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

mov: set flags to indicate that byte wise seeking is not supported.

Fixes Ticket1831

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

doc: add libswresample.texi and ffmpeg-resampler.texi files

doc: move filters documentation to dedicated manual page ffmpeg-filters

doc: move codec options and descriptions to a dedicated manual page

lavf/sbgdec: use proper constants for av_log().

Support u8 in aiff.

Fixes ticket #1960.
Reviewed-by; Paul B Mahol

adpcmdec: Fix OOM/infloop

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

libopencore_amrwb: check packet size

Fix OOM

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

smacker: sanity check audio size.

Fixes, excessive memory allocation
Fixes Ticket1892

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

af_aresample: check ff_get_audio_buffer() failure

Fixes null pointer dereference

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

atrac1: Check block align.

Fixes OOM
Fixes second samples posted in Ticket1893

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

ra288: Check block align.

Fixes OOM
Fixes Ticket1893

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

Fix type of default value for v210 decoder option -custom_stride.

Reviewed-by: Paul B Mahol

c93: signal EOF

mmf: simplify code by using FFMIN

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

mmf: signal EOF

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

omadec: remove stale comment

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

codec_desc: mark PCM A-law/mu-law lossy

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

codec_desc: provide aliases for PCM A-law/mu-law

Inspired by d21b82fd3a72751a77dbeda3aa17a3af5e009565.

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

ADPCM IMA Dialogic decoder

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

rl2: return meaningful error codes

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

wvenc: multichannel muxing

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

omaenc: remove superfluous "OMA: "

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

omaenc: abort for unsupported codecs

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

riff: fix decoding of 24-bit packed int (type 1, 20-bit)

Support G.722 in Sun AU.

Add an annotation field as required by the specification when muxing Sun AU.

Reviewed-by: Paul B Mahol

ratecontrol: Fix assertion failure on mismatching 2pass file.

Fixes Ticket582

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

ffmpeg: fix mixed declarations and statements.

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

ffmpeg: Correct starttime based on non discarded streams.

Fixes Ticket1830

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

ffmpeg: minor simplification of wraping code

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

riff: ignore ff_read_riff_info() failure.

Some files simply contain invalid info tags.
Fixes unrelated bug posted into Ticket1821

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

ffprobe: free dictionary in opt_show_entries()

Fix memleak.

fate: add ADPCM AFC decoder test

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

fate: add AST demuxer test

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

replace av_log(0, by av_log(NULL,

The first parameter is a pointer and NULL is more correct

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

vf_mandelbrot: give all av_log a context

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

x86/mpegvideoenc_template: use av_assert

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

motion_est: use av_assert* instead of assert

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

h263dec: switch 2 asserts to av_assert

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

dv: use av_assert

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: sort cpuflags section by architecture

Conflicts:
configure

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

Merge commit '457cc333b424994ecf80a82369325771e0397fd9'

* commit '457cc333b424994ecf80a82369325771e0397fd9':
  configure: properly support DEC/Compaq compiler

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

Merge commit '4a606c830ae664013cea33800094d4d0f4ec62da'

* commit '4a606c830ae664013cea33800094d4d0f4ec62da':
  av_memcpy_backptr: optimise some special cases
  mpegvideo: simplify dxy calculation in hpel_motion()
  build: add rules to generate preprocessed source files

Conflicts:
Makefile
libavutil/mem.c
library.mak

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

configure: sort cpuflags section by architecture

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

configure: properly support DEC/Compaq compiler

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

av_memcpy_backptr: optimise some special cases

- Add special cases for offsets of 2, 3, or 4 bytes.  This means the
  offset is always >4 in the generic case, allowing 32-bit copies to
  be used there.
- Don't use memcpy() for sizes less than 16 bytes.

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

mpegvideo: simplify dxy calculation in hpel_motion()

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

build: add rules to generate preprocessed source files

This is useful for debugging.  Dependencies for these files are not
generated due to limitations in many compilers.

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

id3v2: restructure compressed and unsync code

This should fix the interaction between the 2.

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

ffv1dec: remove incorrect assert()

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

rmdec: fix av_log level and context

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

truemotion2: Fix av_log level and context

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

mpeg12: fix av_log level and context

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

dcadec: fix av_log level

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

avidec: try to support oddly muxed MMES stream

Fixes ticket1804

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

vqavideo: Reinitialise the actually used partial codebook bytestream-reader.

Fixes ticket #1942.

xmv: signal EOF

Fixes #1946.

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

movenc: fix assert failure caused by rounding.

Fixes Ticket1820

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

ADPCM AFC decoder

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

id3v2: print ver/flags/len on debug level.

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

tests: prefer ffprobe -show_entries to -show_format_entry

The latter option was deprecated.

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  id3v2: fix reading unsynchronized frames.
  cdgraphics: fix incorrect vertical offset mask in cdg_scroll()
  apetag: fix error handling in ff_ape_parse_tag()

Conflicts:
libavformat/id3v2.c

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

ffprobe: implement -sections option

ffprobe: implement subsection field selection through the -show_entries option

id3v2: fix reading unsynchronized frames.

Current code would incorrectly process e.g. 'ff 00 ff 00 ff' to
'ff ff ff', while it should be 'ff ff 00 ff'.

Fixes Bug 395.

CC: libav-stable@libav.org

lavfi/avfiltergraph: improve error message in graph_check_validity()

Fix trac ticket #1944.