Merge commit '37063714c0a064808f9671ec4d376955d664f463'

* commit '37063714c0a064808f9671ec4d376955d664f463':
  build: Only check FATE dependencies when running FATE tests

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

Merge commit '16c22122c788b5e54a2f2e224bd0106429f0714c'

* commit '16c22122c788b5e54a2f2e224bd0106429f0714c':
  h264: K&R formatting cosmetics

Conflicts:
libavcodec/h264.c

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

Merge commit '966689442ed843019dc0722a49bfb0ac51755d19'

* commit '966689442ed843019dc0722a49bfb0ac51755d19':
  buffersink: K&R formatting cosmetics

Conflicts:
libavfilter/buffersink.c

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

lavc: do not override format if neither text nor bitmap codec prop is set

Some decoders may output both, this way the decoder can set it.

Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

dpx: use av_image_copy_plane()

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

dpxenc: cosmetics: reindent

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

targa_y216dec: remove empty function

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

zmbv: return meaningful error code

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

utvideoenc: use av_image_copy_plane()

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

Forward interlaced field information from mov to v210 decoder.

Reported and tested by Dave Rice.

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

doc/codecs: fix dangling reference to codec-options chapter

build: Only check FATE dependencies when running FATE tests

Only check dependencies if invoking the make targets 'check'
or anything matching 'fate%' except 'fate-rsync'.

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

avcodec/vorbisenc: change 6 asserts to av_asserts()

speed relevant ones use av_assert2()

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

avcodec/mpegvideo: update disabled assert() to av_assert0()

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

exr: set pict_type

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

targa: set pict_type

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

escape130: make "chroma_vals" static

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

lclenc: allocate FF_INPUT_BUFFER_PADDING_SIZE for extradata

Also check return value.

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

lclenc: cosmetics: reindent

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

sgidec: safer check for buffer overflow

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

sgidec: return meaningful error codes

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

sgidec: simplify return path

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

h264: K&R formatting cosmetics

buffersink: K&R formatting cosmetics

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  wtv: Drop some casts that now are unnecessary

Conflicts:
libavformat/wtv.c

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

Merge commit '86f042dcabde2a5386dbd95ab0451b274987d253'

* commit '86f042dcabde2a5386dbd95ab0451b274987d253':
  wtv: Make WTV_SECTOR_BITS a 64 bit constant

Conflicts:
libavformat/wtv.c

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

Merge commit '80ade7985cd95156e2156f50adc7b86d0e43a07a'

* commit '80ade7985cd95156e2156f50adc7b86d0e43a07a':
  AIX: add support for shared builds

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

Merge commit 'b512360184ade835fba621f5042d643fc9e2ee9d'

* commit 'b512360184ade835fba621f5042d643fc9e2ee9d':
  avio: Don't set the seekable flag if no seek function is provided

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

Merge commit '1297f7b87f8a84930a23eca705765c7c353dfcd5'

* commit '1297f7b87f8a84930a23eca705765c7c353dfcd5':
  rtpenc: Fix some odd comments

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

Merge commit '779e6c2b985f2ad461a1ae704160822f97709ba7'

* commit '779e6c2b985f2ad461a1ae704160822f97709ba7':
  lavfi: add attribute_align_arg to all public entry points

Conflicts:
libavfilter/buffersink.c

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

avfilter/vf_scale: set in_color_matrix default to "auto"

swscale/fill_rgb2yuv_table: fix default detection

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

avfilter/vf_scale: use sws_getCoefficients()

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

libavcodec/mpegvideo: change some asserts to av_assert0()

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

avcodec/mpegvideo: replace assert about interlaced EC by debug av_log()

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

wtv: Drop some casts that now are unnecessary

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

wtv: Make WTV_SECTOR_BITS a 64 bit constant

This makes sure that values that are left-shifted by this constant
end up casted to 64 bit before shifting, avoiding overflow if the
value ends up larger than 2 GB.

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

AIX: add support for shared builds

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

avio: Don't set the seekable flag if no seek function is provided

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

rtpenc: Fix some odd comments

Some weird comments stem from the fact that the rtpdec and rtpenc
code was shared earlier.

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

qcelpdec: change asserts to av_asserts

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

sgienc: remove unused SgiContext

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

lavfi/frei0r: use AV_OPT_TYPE_IMAGE_SIZE

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

lavfi: add attribute_align_arg to all public entry points

Previously it was partly only added to central functions called
internally, however if GCC would inline these into the public fuction, the
alignment attribute would not take effect.

Instead, add it to all public entry points to avoid these problems.

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

lavfi/frei0r: use AV_OPT_TYPE_VIDEO_RATE

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

avdevice/fbdev: use AV_OPT_TYPE_VIDEO_RATE

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

avdevice/x11grab: use AV_OPT_TYPE_VIDEO_RATE

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

lavfi/gradfun: remove nv21/nv12 as they are not supported

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

pcxenc: get rid of unused PCXContext

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

yop: check return value of av_frame_alloc()

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

vmnc: check return values of reallocation

Also avoid memory leaks.

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

vmnc: make code independent of sizeof(AVFrame)

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

lavfi: add attribute_align_arg to all public entry points

Previously it was partly only added to central functions called
internally, however if GCC would inline these into the public fuction, the
alignment attribute would not take effect.

Instead, add it to all public entry points to avoid these problems.

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

lavfi/buffersrc: remove unused item from BufferSourceContext

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

avformat/dtsdec: Improve probe, reject things looking like analoge signals

Fixes Ticket2810

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  miscellaneous typo fixes

Conflicts:
configure
libavformat/avisynth.c

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

Merge commit '93a51984a27f3ba84d4e6f13d0c704ee9891603e'

* commit '93a51984a27f3ba84d4e6f13d0c704ee9891603e':
  mpeg12: Ignore slice threading if hwaccel is active

Conflicts:
libavcodec/mpeg12dec.c

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

Merge commit '582963a8156522582e55466be4a59974a8d909a5'

* commit '582963a8156522582e55466be4a59974a8d909a5':
  vdpau: Fix VC-1 interlaced mode

Conflicts:
libavcodec/vdpau_vc1.c

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

Merge commit '4a2ef39442bf7f0150db07a1fbfcf8286e4d44a3'

* commit '4a2ef39442bf7f0150db07a1fbfcf8286e4d44a3':
  cosmetics: Add '0' to float constants ending in '.'.

Conflicts:
libavcodec/ra288.c

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

Merge commit '6c145ecf785dc3d26ba3fed3ea9892cc80244625'

* commit '6c145ecf785dc3d26ba3fed3ea9892cc80244625':
  twinvq: K&R formatting cosmetics

Conflicts:
libavcodec/twinvq.c

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

Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Show max bitrate for mpeg2 video streams in avcodec_string().
  Allow native compilation on the iPhone.

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

lavu/opt: show default values for AV_OPT_TYPE_PIXEL_FMT and AV_OPT_TYPE_SAMPLE_FMT too

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

avformat/gxfenc: Added support for writing correct auxiliary data for DV streams.

Different aux data is written for DVCAM and DVPRO formats.

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

miscellaneous typo fixes

mpeg12: Ignore slice threading if hwaccel is active

Slice threading does not work with hardware acceleration, as decoding
is per-picture.  This fixes Bugzilla #542.

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

Show max bitrate for mpeg2 video streams in avcodec_string().

See also 25b7aa9

Allow native compilation on the iPhone.

avfilter/can_merge_formats: fix memleak

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

avfilter/avfiltergraph: fix check using the wrong variables

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

vdpau: Fix VC-1 interlaced mode

VDPAU expects the bitstream value (0, 2 or 3).
libavcodec uses an enum (0, 1 or 2).

Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
Signed-off-by: Diego Biurrun <diego@biurrun.de>

cosmetics: Add '0' to float constants ending in '.'.

twinvq: K&R formatting cosmetics

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  arm: Comment out unused labels in simple_idct_arm

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

avfilter/vf_scale: use the inputs color range when its set and its not overridden

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

swscale/sws_getColorspaceDetails: dont fail for non yuv

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

avcodec/mjpegdec: Support RGBA lpegs

Fixes Ticket896

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

swscale: exchange src & dst chroma pos

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

arm: Comment out unused labels in simple_idct_arm

When building for iOS in thumb mode, gas-preprocessor.pl doesn't
mark unused labels as thumb functions (as it does for other
local labels, where it can figure out that they are functions
due to being referenced in branch instructions). This leads to
linker warnings for some of those local labels, such as:

ld: warning: ARM function not 4-byte aligned: __a_evaluation from
libavcodec/libavcodec.a(simple_idct_arm.o)

Therefore, comment them out since they don't have any function.
They do still have a value in documenting key points in the
assembly source though.

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

vf_scale: add input h/v_chr_pos parameters

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

vf_scale: add output h/v_chr_pos parameterss

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

doc/encoders: partially rewrite and reformat libx264 docs

Format is based on the thread:
"[PATCH] doc/encoders: Add libopus encoder doc" (06-28-2013)
http://thread.gmane.org/gmane.comp.video.ffmpeg.devel/165368/

Also merge the two option sections (Mapping and Private options).

Patch partially edited by Stefano Sabatini.

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

matroskaenc: implement CueRelativePosition

This is a minimal change to matroskaenc that implements CueRelativePosition in the output.
Most players will probably ignore this additional information, but it is in the
matroska spec, and it'd be nice to be able to make use of it.

Signed-off-by: Bernt Habermeier <bernt@wulfram.com>
Tested-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/mpeg12dec: remove commented out assert

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

documented that av_codec_close is required to call

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

alsdec: minor simplification in read_block()

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  8bps: Make the bound-checks consistent

Conflicts:
libavcodec/8bps.c

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

Merge commit 'bd7b4da0f4627bb6c4a7c2575da83fe6b261a21c'

* commit 'bd7b4da0f4627bb6c4a7c2575da83fe6b261a21c':
  8bps: Bound-check the input buffer

Conflicts:
libavcodec/8bps.c

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

Merge commit '2f034f255c49050e894ab9b88087c09ebe249f3f'

* commit '2f034f255c49050e894ab9b88087c09ebe249f3f':
  4xm: Reject not a multiple of 16 dimension

The newly added checks are redundant and thus replaced by asserts

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

Merge commit 'ca488ad480360dfafcb5766f7bfbb567a0638979'

* commit 'ca488ad480360dfafcb5766f7bfbb567a0638979':
  alsdec: Clean up error paths

Conflicts:
libavcodec/alsdec.c

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

Merge commit '70ecc175c7b513a153ac87d1c5d219556ca55070'

* commit '70ecc175c7b513a153ac87d1c5d219556ca55070':
  alsdec: Fix the clipping range

Conflicts:
libavcodec/alsdec.c

See: feaff427c0df015146f660199453bd8c0314e677

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

avformat/http: support reading compressed data

Derived from VLC's http module.
Original authors:
  Antoine Cellerier <dionoea@videolan.org>
  Sébastien Escudier <sebastien-devel@celeos.eu>
  Rémi Duraffort <ivoire@videolan.org>
  Rémi Denis-Courmont <remi@remlab.net>
  Francois Cartegnie <fcvlcdev@free.fr>

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

avcodec/utils: Warn the user about the lack of a lock manager if insufficient locks are detected

A lock manager is not the only possibility to avoid open/close locking
issues but its easier and more robust than maintaining a lot of lock/unlock
calls.

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

8bps: Make the bound-checks consistent

8bps: Bound-check the input buffer

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

4xm: Reject not a multiple of 16 dimension

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

alsdec: Clean up error paths

Fix at least a memory leak.

CC: libav-stable@libav.org

alsdec: Fix the clipping range

mcc_weightings is only 32 elements.

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

avcodec/utils: use av_assert0() to check validity of input pointers for start code search

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

avfilter/avfiltergraph: minor cosmetic

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

avfilter: Dont partially merge lists

This prevents the unneeded insertion of multiple aresample filters in some cases

The format merging is moved to avoid having to call the channel layout
merge twice. The channel layout merge code uses different structures and
is not compatible with the added dry run wrappers.

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