Merge commit '12db891dcd57b305d6e3c1e22ea8204dc26edda1'

* commit '12db891dcd57b305d6e3c1e22ea8204dc26edda1':
  avf: move ff_write_chained to mux.c

Conflicts:
libavformat/mux.c
libavformat/utils.c

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

Merge commit '508998f7d5cc61c7ac7b049813b47adc24c6e282'

* commit '508998f7d5cc61c7ac7b049813b47adc24c6e282':
  avf: move riff tags accessors where they belong

Conflicts:
libavformat/utils.c

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

Merge commit 'ec7c51c7868d3ccc66b5cc38bf126258b94f086c'

* commit 'ec7c51c7868d3ccc66b5cc38bf126258b94f086c':
  avf: move ff_http_match_no_proxy to network

Conflicts:
libavformat/internal.h
libavformat/utils.c

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

Merge commit 'afc8685395e775fe0f2a1698b683aea4afd124af'

* commit 'afc8685395e775fe0f2a1698b683aea4afd124af':
  avf: split off format register and lookup function

Conflicts:
libavformat/utils.c

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

Merge commit 'f80b60ad59945dae32bb26a4e239ed94b0e92fa3'

* commit 'f80b60ad59945dae32bb26a4e239ed94b0e92fa3':
  bitstream: forward error values and drop few abort()

Conflicts:
libavcodec/bitstream.c

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

Merge commit 'f776899a17dce32ad7fb9231d98f15558f37cc3f'

* commit 'f776899a17dce32ad7fb9231d98f15558f37cc3f':
  bitstream: K&R formatting cosmetics

Conflicts:
libavcodec/bitstream.c

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

Merge commit '9e80eda26d06c7c48dbec5dfe643c857c62c0ee7'

* commit '9e80eda26d06c7c48dbec5dfe643c857c62c0ee7':
  h264_mp4toannexb_bsf: return a padded buffer

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

Merge commit '8d929afd256069aa881f2bf58ef9f0ffce2d6b7e'

* commit '8d929afd256069aa881f2bf58ef9f0ffce2d6b7e':
  h264_mp4toannexb_bsf: factor out extradata parsing

Conflicts:
libavcodec/h264_mp4toannexb_bsf.c

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

Merge commit '5d21ca45591bb1c1d2265f8ed972d18c563f145e'

* commit '5d21ca45591bb1c1d2265f8ed972d18c563f145e':
  h264_mp4toannexb_bsf: K&R formatting cosmetics

Conflicts:
libavcodec/h264_mp4toannexb_bsf.c

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

lavf: show APIC for tta files too

Fixes #2676.

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

tta: read ape tags last

Otherwise, cover art will create video stream with index 0.
Fixes #2677.

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

postprocess_template: put rsp on the clobber list to prevent gcc from using it in "q"

Fixes Ticket2675

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

avcodec/jpeg2000dec: move bpno check to a earlier place

This prevents additional integer overflows

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

avf: move ff_write_chained to mux.c

avf: move riff tags accessors where they belong

avf: move ff_http_match_no_proxy to network

It is only used by network protocols.

avf: split off format register and lookup function

lavu/adler32: Fix doxy group definition, take two

The description if for the function, not the group.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

lavu/hash: Add support for RIPEMD

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

rawdec: allocate a buffer in the appropriate size in the copy case.

Otherwise the created buffer can be smaller than buf_size, which results
in buffer overreads if the original image has extra padding on every line.

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

bitstream: forward error values and drop few abort()

bitstream: K&R formatting cosmetics

Merge branch 'crypto' of https://github.com/jamrial/FFmpeg

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

lavu: Add RIPEMD hashing

Includes RIPEMD-128, RIPEMD-160, RIPEMD-256 and RIPEMD-320

Signed-off-by: James Almer <jamrial@gmail.com>

lavf/md5enc: Use AV_HASH_MAX_SIZE

Also increase the buffer size in write_trailer(), since 128
is not enough anymore

Signed-off-by: James Almer <jamrial@gmail.com>

lavu/hash: Add support for SHA-2 512

Signed-off-by: James Almer <jamrial@gmail.com>

lavu/utils: silence warnings about incompatible pointer types

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

Document "cache" protocol

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

h264_mp4toannexb_bsf: return a padded buffer

The code using the returned buffer might expect it to be
FF_INPUT_BUFFER_PADDING_SIZE padded as any other avpacket.

h264_mp4toannexb_bsf: factor out extradata parsing

avcodec/vc1dec: Check source picture availability in vc1_mc_4mv_chroma4()

Fixes null pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avutil/utils: check and warn about llrint() brokenness

Such broken llrint() exist for example on netbsd

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

h264_mp4toannexb_bsf: K&R formatting cosmetics

lavu/md5: Add doxy

Mostly a copy&paste from other hash functions, with changes
where required.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

lavu/crc: Fix doxy group definition

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

lavu/adler32: Fix doxy group definition

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/g2meet: Check monochrome cursor width

Fixes out of array write

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/jpeg2000dec: check len before parsing header

Fixes out of array read

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/jpeg2000dec: Check Psot

Fixes out of array read

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

apetag: do not require seekable output

Also don't write empty tags.

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

avcodec_encode_audio2: fix memleak on last padded frame

Regression introduced by 799f57ac96f9891d1a0f7d6c4b218ed536e8aca5

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

mpegts: Enable muxing of SMPTE KLV metadata

Muxer code rebased/split out by: Jeff Blackburne <jblackburne@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

vc1_parser: fix parsing of the frame headers in interlaced streams

first_pic_header_flag needs to be set to allow the parsing code to change
some stream parameters, and not error out.

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

lavfi/spp: fix description.

doc/general: Make the license status of the Android libraries clearer

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

drawbox: Respect thickness parameter

The drawbox video filter is drawing lines one pixel thinner than
requested. The default thickness is 4 pixel but in fact the lines
drawn by default are only 3 pixel wide.

Change the comparisons in the code to fix this off-by-one bug. Also
change the default thickness from 4 to 3 to minimize the unexpected
changes from the user's perspective.

As I was already touching these lines, I also removed the "maximum" in
the thickness parameter description, as I don't think it was adding
any value and I even found it confusing.

Reviewed-by: Andrey Utkin <andrey.krieger.utkin@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

jpeg2000dec: Check compno in get_coc()

Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

lavfi/mp: remove mp=spp.

The filter was ported to a native libavfilter filter.

lavfi: add spp filter.

jpeg2000dec: dont set ncomponents to an invalid value

Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

lavc: copy AVCodecContext for threads

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

flacdec: Fix used AVCodecContext

Fixes out of array writes with multiple threads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avutil/timestamp: remove ""

This may fix an error with C++

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  4xm: check bitstream_size boundary before using it

Conflicts:
libavcodec/4xm.c

See: 9c661e95

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

Merge commit 'fbd0dacc8d61ab418b3fa8e7be22017558323e56'

* commit 'fbd0dacc8d61ab418b3fa8e7be22017558323e56':
  4xm: refactor decode_p_block

Conflicts:
libavcodec/4xm.c

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

Merge commit '94aefb1932be882fd93f66cf790ceb19ff575c19'

* commit '94aefb1932be882fd93f66cf790ceb19ff575c19':
  4xm: do not overread the source buffer in decode_p_block

Conflicts:
libavcodec/4xm.c

The checks are replaced by av_assert0() as the conditions should
be impossible. If these asserts fail, there is a bug elsewhere

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

Merge commit 'be373cb50d3c411366fec7eef2eb3681abe48f96'

* commit 'be373cb50d3c411366fec7eef2eb3681abe48f96':
  4xm: do not overread the prestream buffer

Conflicts:
libavcodec/4xm.c

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

Merge commit 'de2e5777e225e75813daf2373c95e223651fd89a'

* commit 'de2e5777e225e75813daf2373c95e223651fd89a':
  4xm: validate the buffer size before parsing it

Conflicts:
libavcodec/4xm.c

See: 9c661e95

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

Merge commit '145023f57262d21474e35b4a6069cf95136339d4'

* commit '145023f57262d21474e35b4a6069cf95136339d4':
  4xm: reject frames not compatible with the declared version

See: c433823750bf096187e70c22822431a7c0bb4202

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

Merge commit '1f0c6075604c271d5627480f1243d22795f9a315'

* commit '1f0c6075604c271d5627480f1243d22795f9a315':
  4xm: drop pointless assert

Conflicts:
libavcodec/4xm.c

The added condition is impossible to occur and thus is added to the assert.
The assert is not removed from the default case, as the default case cannot
occur. Thus either it should stay as is or the case as a whole be removed.
For extra safety, to ensure this doesnt change the assert is changed to
av_assert0()

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

Merge commit 'b8b809908ec547b2609dbac24194f4fd2df61aea'

* commit 'b8b809908ec547b2609dbac24194f4fd2df61aea':
  4xm: forward errors from decode_p_block

Conflicts:
libavcodec/4xm.c

Impossible to be false check has been replaced by av_assert0()

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

Merge commit '50ec1db62d977b6e864f315a53c1c580a6d7efa4'

* commit '50ec1db62d977b6e864f315a53c1c580a6d7efa4':
  4xm: fold last_picture lazy allocation in decode_p_frame

Conflicts:
libavcodec/4xm.c

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

Merge commit '42d73f7f6bea0ee0f64a3ad4882860ce5b923a11'

* commit '42d73f7f6bea0ee0f64a3ad4882860ce5b923a11':
  4xm: do not overread while parsing header

Conflicts:
libavformat/4xm.c

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

Merge commit 'e7a44f87d07655ec0cd31c315936931674434340'

* commit 'e7a44f87d07655ec0cd31c315936931674434340':
  4xm: refactor fourxm_read_header

Conflicts:
libavformat/4xm.c

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

Merge commit 'e6496ea7e7ea7355167a1ccbe67a7199d446a654'

* commit 'e6496ea7e7ea7355167a1ccbe67a7199d446a654':
  4xm: K&R formatting cosmetics

Conflicts:
libavformat/4xm.c

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

Merge commit '08859d19b429c522d6494c186656f4a2d3ff8e21'

* commit '08859d19b429c522d6494c186656f4a2d3ff8e21':
  4xm: use the correct logging context
  g2meet: Fix a typo in the height comparison

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

h264: Try parsing SPS as complete NAL in more cases

Fixes Ticket2580

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

require --enable-gpl for using the frei0r filter

frei0r license is GPL.

Based on a patch by Timothy Gu <timothygu99@gmail.com>.

See thread:
Subject: [FFmpeg-devel] [PATCH 1/2] LICENSE: Complete GPL'd external libraries list
Date: Thu,  6 Jun 2013 18:55:30 -0700

lavfi/rotate: add angle command

tests: add filter-pixfmts-rotate test

lavfi: add rotate filter

Based on the libavfilter SOC filter by Vitor Sessak, with the following additions:
* integer arithmetic
* bilinear interpolation
* RGB path
* configurable parametric angle, output width and height

Address trac issue #1500.

See thread:
Subject: [FFmpeg-devel] [WIP] rotate filter(s)
Date: 2010-10-03 17:35:49 GMT

doc/encoders: Add libvo-amrwbenc doc

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

alacenc: Fix missing sign_extend()

Possibly fixes Ticket2497

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

4xm: check bitstream_size boundary before using it

Prevent buffer overread.

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

4xm: refactor decode_p_block

Directly return from code 1, 2 and 6 codepaths and simplify the
remaining one to have a single overflow check and a single call to
mcdc.

4xm: do not overread the source buffer in decode_p_block

Check for out of picture macroblocks before calling mcdc.

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

4xm: do not overread the prestream buffer

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

4xm: validate the buffer size before parsing it

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

4xm: reject frames not compatible with the declared version

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

4xm: drop pointless assert

Make sure the value of wlog2 is always between 0 and 3.

4xm: forward errors from decode_p_block

Partially mitigate out of memory writes.

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

4xm: fold last_picture lazy allocation in decode_p_frame

4xm: do not overread while parsing header

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

4xm: refactor fourxm_read_header

Split sound and video tag parsing in separate functions.

4xm: K&R formatting cosmetics

4xm: use the correct logging context

g2meet: Fix a typo in the height comparison

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  g2meet: do not leak buffers
  g2meet: more graceful cursor loading
  g2meet: reset dimensions on header parsing errors

Conflicts:
libavcodec/g2meet.c

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

g2meet: do not leak buffers

g2meet: more graceful cursor loading

g2meet: reset dimensions on header parsing errors

fate: Add test vectors for HMAC SHA and SHA-2

Also replace custom tests for MD5 with those published in RFC 2202

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

lavu/hmac: Add support for SHA-2

Includes HMAC-SHA-224, HMAC-SHA-256, HMAC-SHA-384, and HMAC-SHA-512.
Tested using test vectors from https://tools.ietf.org/html/rfc4231

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avformat/mov: ignore samples overflowing next_root_atom

This fixes #2657.
ISML movies produced by Microsoft Expression Encoder 4 seem to have invalid
sample entries in their trun/tfhd for data tracks. As a result, too much bytes
are read for these tracks to the point that next_root_atom can go out of
buffer, which makes the encoding fail if the input is not seekable.

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

doc/general: s/Libav/FFmpeg

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

fate: wavpack: add more dependencies

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavc: add a libwavpack encoder wrapper

Conflicts:
Changelog
doc/encoders.texi
libavcodec/version.h

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

Merge commit '799f57ac96f9891d1a0f7d6c4b218ed536e8aca5'

* commit '799f57ac96f9891d1a0f7d6c4b218ed536e8aca5':
  lavc: use AVFrame API properly in pad_last_frame().

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

Merge commit '8835c554ff506992c47f6e347c74216ae073f0fa'

* commit '8835c554ff506992c47f6e347c74216ae073f0fa':
  matroskadec: introduce resync function.

Conflicts:
libavformat/matroskadec.c

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

Merge commit '3965d404ccd9b6cac95c4aee6cb668845031b685'

* commit '3965d404ccd9b6cac95c4aee6cb668845031b685':
  configure: Don't add -fPIC on windows targets

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