Merge commit 'b963f021b603509b5159873de4919dec441d0782'

* commit 'b963f021b603509b5159873de4919dec441d0782':
  fate: Invoke pixfmts lavfi tests through fate-run.sh

Conflicts:
tests/fate/avfilter.mak
tests/lavfi-regression.sh

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

lavfi/mp: remove mp=tinterlace wrapper

From various tests, there is no evidence that the filter is faster than
the native tinterlace, and it has several more limitations and a few
bugs.

See thread:
Subject: [FFmpeg-devel] [NOPATCH] lavfi/mp: drop tinterlace wrapper
Date: Wed, 5 Sep 2012 00:26:01 +0200

lavfi/transpose: apply grammar consistency fixes to transpose dir option

doc/filters: apply various general fixes to vidstabdetect docs

Adopt generally used conventions, extend and clarify explanations.

Merge commit '28663511c99b3cdaf9387a15032259879474f5f4'

* commit '28663511c99b3cdaf9387a15032259879474f5f4':
  fate: Invoke pixdesc lavfi tests through fate-run.sh

Conflicts:
tests/fate/avfilter.mak
tests/lavfi-regression.sh
tests/ref/fate/filter-pixdesc

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

Merge commit '03b052c023e1f58d879cb7eeb6421ed39262d39d'

* commit '03b052c023e1f58d879cb7eeb6421ed39262d39d':
  fate: Invoke standard lavfi tests through fate-run.sh

Conflicts:
tests/fate/avfilter.mak
tests/lavfi-regression.sh

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

Merge commit 'c14010541035454b4d3ad08399d70423be4e0c87'

* commit 'c14010541035454b4d3ad08399d70423be4e0c87':
  oma: K&R formatting cosmetics

Conflicts:
libavformat/omadec.c

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

Merge commit '26a44143efb513a602542fb59aee87b1fc62af51'

* commit '26a44143efb513a602542fb59aee87b1fc62af51':
  avplay: remove a warning

Conflicts:
ffplay.c

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

Merge commit 'cf679b9476727a237c8006c685ace18acba149ab'

* commit 'cf679b9476727a237c8006c685ace18acba149ab':
  hls, segment: fix splitting for audio-only streams.

Conflicts:
libavformat/hlsenc.c
libavformat/segment.c

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

avformat: Add black ops audio demuxer

Fixes Ticket2064

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

ffv1enc: favor version 3 over 2 unless -strict -2 is set

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

lavu/mem: remove redundant comment from av_dynarray_add()

The function is documented in mem.h.

doc/filters: update/extend transpose filter documentation

In particular, deprecate numerical values for the dir option.

lavfi/transpose: reindent constants

lavfi/transpose: restore validity of values in range 4-7

They were lost in commit a4e0defa75b6f766aa31d80c55688d036b5fd87b.

doc/filters: readjust w/h option descriptions

doc/filters: fix grammar for removelogo filter doc sentence

fate: Invoke pixfmts lavfi tests through fate-run.sh

fate: Invoke pixdesc lavfi tests through fate-run.sh

fate: Invoke standard lavfi tests through fate-run.sh

ffv1dec: remove redundant error message.

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

ffv1dec: add code to support frame threading with gop=1 ffv1

CODEC_CAP_FRAME_THREADS is not added yet because that would
unconditionally enable it, breaking gop>1 files.

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

ffv1: Store a flag in the global header that indicates if all frames are keyframes

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

astats filter

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  x86: ac3dsp: Remove 3dnow version of ff_ac3_extract_exponents

Conflicts:
tests/fate/ac3.mak

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

oma: K&R formatting cosmetics

avplay: remove a warning

Set the data field in the flush_pkt to the pointer to the actual packet.
The field needs to contain a valid unique pointer, no read nor writes
are ever made to it.

hls, segment: fix splitting for audio-only streams.

CC:libav-stable@libav.org

lavfi/negate: unbreak negate alpha

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

doc/filters: remove non-existent ft_load_flags entry

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

avcodec_string: Print the used codec if it differs from the codec_id name.

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

avcodec_string: remove the "(hq)" listing

printing "hq" depending on a single video encoding parameter makes
little sense

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

avutil/log: dont count&print repeats for empty strings

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

avcodec/intrax8: fix regression with wmv3

This also decreases dependancies between intrax8 and the outside

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

lavfi/hqdn3d: remove timeline flag.

The filter stores some temporal data, which needs to be done with the
passthrough callback system when timeline is enabled. Until then,
timeline support is disabled.

x86: ac3dsp: Remove 3dnow version of ff_ac3_extract_exponents

The function requires increasing the fuzz factor for the ac3/eac3 encode
tests and even so makes fate fail. It only provides a slight encoding
speedup for legacy CPUs that do not support SS2. Thus its benefit is not
worth the trouble it creates and fixing it would be a waste of time.

avutil/log: leave prefix printing state on empty input.

Fixes printing the prefix after an empty string was printed

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

vc1dec: make sure next_use_ic is set correctly

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

vc1dec: factor lut clean code

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

avformat/write_packet: drop disabled code

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

avformat/mux: set avoid_negative_ts based on flags if not overridden by user or muxer

This changes the default to avoid negative timestamps.

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

avformat/movenc: mov/mp4 should support negative timestamps through edit lists

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

avformat/mux: assert that timestamps are positive after offsetting them

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

avformat/mux: use a local variable for offset

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

avformat/mux: change avoid_negative_ts code to support later addition of AVStreams

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

dcaenc: silence address sanitizer warning

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

lavfi/stereo3d: avoid division when changing aspect ratio

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

lavfi/afade: fix AVOptions descriptions

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

doc/filters: fix afade 2nd example

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

lavfi/curves: add support for more rgb formats

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

lavfi: support timeline for colorbalance and colorchannelmixer

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

Merge remote-tracking branch 'qatar/master'

* commit '74685f6783e77f2545d48bd2124945ad5be39982':
  x86: Rename dsputil_rnd_template.c to rnd_template.c

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

Merge commit 'c2cb01d418dd18e1cf997c038d37378d773121be'

* commit 'c2cb01d418dd18e1cf997c038d37378d773121be':
  lavf: introduce AVFMT_TS_NEGATIVE

Conflicts:
libavformat/avformat.h
libavformat/mux.c
tests/ref/lavf/asf
tests/ref/lavf/mkv
tests/ref/lavf/mpg
tests/ref/lavf/ts
tests/ref/seek/lavf-asf
tests/ref/seek/lavf-mkv
tests/ref/seek/lavf-mpg
tests/ref/seek/lavf-ts

This commit does not change the default ts behaviour, such
change will, if its done, be done separately.

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

vc1dec: remove interlaced warning

While not yet bugfree, the warning is IMHO no longer appropriate

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

lavfi/unsharp: add opencl unsharp filter

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

lavu/opencl:add opencl set param function

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

fate: re-enable fate-acodec-dca2

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

vc1dec: Try to fix vc1_mc_4mv_chroma4() parameters

This fixes several chroma artifacts in several videos

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

vc1dec: add avg & variable direction support to vc1_mc_4mv_chroma4()

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

vc1dsp: add avg_no_rnd_vc1_chroma_mc4_c()

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

vc1dec: fix doxy for vc1_mc_4mv_chroma4()

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

vima: add @file doxy

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

vima: generate predict_table once, and share it with all decoders

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

lavc/cdxl: add @file doxy

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

x86: Rename dsputil_rnd_template.c to rnd_template.c

This makes it less confusing when this template is shared both by
dsputil and by hpeldsp.

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

fate: update dca test and disable dca2 test

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

lavfi/noise: remove get_video_buffer, its redundant now

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

lavfi/noise: add missing emms_c()

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

lavfi/telecine: show time base change too

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

dcaenc: update

Long story short: previous code was useless and was port of older
dcaenc, this commit just "sync" with current dcaenc, hopefuly
making this encoder more useful.

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

avcodec/pthread: use THREAD_SAFE_CALLBACKS() to simplifx more code

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

avcodec/pthread: Make sure ff_thread_finish_setup() conditions match

Prevents warning from being shown due to multiple calls.

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

vc1dec: drop mv_f_last, simplify code

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

doc/filters: put vidstab filters documentation in a sensible order

doc/filters: remove "q" constant docs for noise mode

It was removed in 62447248f3e5eb95dbd9f123696321903d4d0921.

doc: remove all-components.texi, include its content verbatim

Force re-generation of the manuals when an included file is modified.
The current dependency generation system is enable to track nested
inclusions.

The drawback is that the files will be generated even when there is no
strict need (for example if filters.texi is modified, ffmpeg.1 is
rebuilt), thus it trades a false negative with a false positive.

lavf: introduce AVFMT_TS_NEGATIVE

Most formats do not support negative timestamps, shift them to avoid
unexpected behaviour and a number of bad crashes.

CC:libav-stable@libav.org

Signed-off-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

Merge commit 'fc18cc44ebfae07da153dc782572e7ce2f6fe47d'

* commit 'fc18cc44ebfae07da153dc782572e7ce2f6fe47d':
  fate: add CVFC1_Sony_C to h264 conformance tests
  doc/APIchanges: add missing hashes and dates

Conflicts:
doc/APIchanges
tests/fate/h264.mak

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

lavc: remove unused put_bits.h headers

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

lavfi/subtitles: zero-init AVSubtitle.

This avoids invalid free when the stream id doesn't match the packet
stream index.

Ticket #2501

Merge remote-tracking branch 'cigaes/master'

* cigaes/master:
  lavc: check decoded subtitles encoding.
  lavu: fix GET_UTF8 macro.

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

vc1dec: drop old use_ic code from vc1_b_mc

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

vc1: use use_ic instead of shuffling mv_mode around

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

vc1dec: Implement intensity compensation for vc1_interp_mc()

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

vc1dec: redesign the intensity compensation

The existing implementation had little to do with VC1.
This could be implemented by adjusting the reference frames
ithemselfs but that would make frame multi-threading difficult.

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

lavfi: add timeline support in {de,remove}logo.

Both don't change anything in the context between frames.

lavc: check decoded subtitles encoding.

Address trac ticket #2431.

lavu: fix GET_UTF8 macro.

Prevent 0xFE and 0xFF from being considered the start of
non-standard 7-bytes sequences. No noticeable effect on speed.

lavfi: add vidstabutils.h to SKIPHEADERS.

Fix checkheaders when vid.stab is not available.

lavfi/vidstabdetect: fix direct path.

The frame must be writable if the show option is set, otherwise pass the
frame unchanged.

lavfi/vidstab: remove mention of defaults for consistency with other filters.

lavfi/vidstab: make use of direct variable.

lavfi/vidstab: add missing flags for 2 options.

doc/filters: reword vidstab options intro.

lavfi/vidstab: consistent descriptions.

lavfi/vidstab: miscelenaous cosmetics and typo fixes.

lavfi: add video stabilization plugins using vid.stab library

vidstabdetect and vidstabtransform common functions for interfacing
vid.stab are in libavfilter/vidstabutils.c

Signed-off-by: Georg Martius <martius@mis.mpg.de>

doc/filters: amend documentation for the hue filter

Make clear that the options accept an expression.

doc/filters: introduce example in vflip filter

doc/filters: split luma/chroma descriptions for unsharp option

Honour declaration order in filter implementation, for shorthand
consistency.