Merge commit 'd4c12b8be4bdd2ffddb3bd5e11773de4c4c46f68'

* commit 'd4c12b8be4bdd2ffddb3bd5e11773de4c4c46f68':
  oggparsetheora: K&R cosmetics, reformat

Conflicts:
libavformat/oggparsetheora.c

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

Merge commit 'b9589f5a770ec2357ab7920a5fabe8510b8601f9'

* commit 'b9589f5a770ec2357ab7920a5fabe8510b8601f9':
  lavc: add error checking to apply_param_change.

Conflicts:
libavcodec/utils.c

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

Merge commit '5c0a09839c707f10e5dba59460e219e989c1da93'

* commit '5c0a09839c707f10e5dba59460e219e989c1da93':
  libopenjpegdec: return meaningful error codes

Conflicts:
libavcodec/libopenjpegdec.c

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

oggparsetheora: K&R cosmetics, reformat

Also typedef the private data struct and make its name consistent with
the rest of Libav.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>

lavc: add error checking to apply_param_change.

libopenjpegdec: return meaningful error codes

avcodec/mpeg12dec: forward errors when EXPLODE is set

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

lavf/spdifdec: fix demuxing of AAC in IEC 61937

Return value of avpriv_aac_parse_header() is not checked correctly. Fix
it.

Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  build: remove pointless condition

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

Merge commit '58d13cea307e776664dae711608b358dd4b84fff'

* commit '58d13cea307e776664dae711608b358dd4b84fff':
  h264: Check all allocations

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

tests/fate: fix fate on branches different from origin/master

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

tests/fate.sh: run git reset only when fetch succeded

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

Merge commit '9510d7689e236f6a4748795604fba427c130d0ad'

* commit '9510d7689e236f6a4748795604fba427c130d0ad':
  fate.sh: Allow non-fast-forwards when updating sources

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

Merge commit 'c872d310cd9c605e5f994ad8ac79dc72303c0d29'

* commit 'c872d310cd9c605e5f994ad8ac79dc72303c0d29':
  avconv: stop accessing AVStream.parser

Conflicts:
ffmpeg.h

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

avutil/opt: fix flags check on non x86

This should fix several fate failures

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

Merge commit '8b64c2ba0382892cad9e1a5ba601696d4cbb4d04'

* commit '8b64c2ba0382892cad9e1a5ba601696d4cbb4d04':
  lavc: add a dummy field to AVStream to preserve ABI compatibility for avconv

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

lavf: remove unreliable timestamp guessing heuristic

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

Merge commit '25c7db7cc99d74fe6fb56a6fd52c9b5f1591e448'

* commit '25c7db7cc99d74fe6fb56a6fd52c9b5f1591e448':
  avio: Check for memory allocation failure of private data

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

Merge commit '327c439f811a89d774db9a86f72951d295193e5f'

* commit '327c439f811a89d774db9a86f72951d295193e5f':
  timefilter: Handle memory allocation failure

Conflicts:
libavdevice/jack_audio.c
libavdevice/timefilter.c

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

Merge commit 'e78913052263af80855590659fb0f705e8f13c8a'

* commit 'e78913052263af80855590659fb0f705e8f13c8a':
  configure: Provide an hardened toolchain option

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

Merge commit 'dcd3eda6cb8884beeb67ef5eb61b4bb6b01d29ea'

* commit 'dcd3eda6cb8884beeb67ef5eb61b4bb6b01d29ea':
  configure: Move gcc-only -W option where it belongs

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

avformat/avisynth: re-add trailing \n.

Regression since ac9529ce.

Spotted by Timothy Gu.

lavc/mpegvideo_enc: fix typo

lavc: extend documentation for the "bf" option

doc/muxers: add definitory line for the MOV/MP4/ISMV muxer

Also rename section name, to match the other ones adopting the muxer name
(rather than the related upcased standard name).

avcodec/mpegvideo_enc: check that max_b_frames is not negative

Fixes crash found by saste
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

matroskaenc: fixed display width / height calculation for stereo mode

Based-on: patch by Asan Usipov <asan.usipov@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

build: remove pointless condition

$(STRIP) always expands to something, because it is one of the commands
in the BRIEF list. This renders the condition pointless.

Signed-off-by: Ingo Brückl <ib@wupperonline.de>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

h264: Check all allocations

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

fate.sh: Allow non-fast-forwards when updating sources

avconv: stop accessing AVStream.parser

It is private and must not be touched from outside of lavf.

lavc: add a dummy field to AVStream to preserve ABI compatibility for avconv

avconv abuses the API by accessing AVStream.parser (which is private).
Removing AVStream.reference_dts in
2ba68dd044ca8fc591139c05563840f546a9c0c0 breaks ABI compatibility for an
old avconv using a newer lavf. Fix this by adding a dummy field until
the next bump.

h264: Check all allocations

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

avio: Check for memory allocation failure of private data

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

timefilter: Handle memory allocation failure

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

timefilter: Fix typo in allocation failure message

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavfi: do not export the filters from shared objects

Conflicts:
libavfilter/af_amix.c
libavfilter/af_anull.c
libavfilter/asrc_anullsrc.c
libavfilter/f_select.c
libavfilter/f_settb.c
libavfilter/split.c
libavfilter/src_movie.c
libavfilter/vf_aspect.c
libavfilter/vf_blackframe.c
libavfilter/vf_colorbalance.c
libavfilter/vf_copy.c
libavfilter/vf_crop.c
libavfilter/vf_cropdetect.c
libavfilter/vf_drawbox.c
libavfilter/vf_format.c
libavfilter/vf_framestep.c
libavfilter/vf_frei0r.c
libavfilter/vf_hflip.c
libavfilter/vf_libopencv.c
libavfilter/vf_lut.c
libavfilter/vf_null.c
libavfilter/vf_overlay.c
libavfilter/vf_scale.c
libavfilter/vf_transpose.c
libavfilter/vf_unsharp.c
libavfilter/vf_vflip.c

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

configure: Provide an hardened toolchain option

configure: Move gcc-only -W option where it belongs

Merge commit 'feeafb4adabd5c17de1738ed9962e40892b20edb'

* commit 'feeafb4adabd5c17de1738ed9962e40892b20edb':
  lavf: do not export av_register_{rtp,rdt}_dynamic_payload_handlers from shared objects

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

avcodec/audioconvert: deprecate API

Note, the header was not installed so useage of this should be limited
but its not 0, there are some random pieces of code using it according
to google.

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

avcodec/cook: use av_freep()

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

Merge commit 'c9a13a289d0e1607387854127476813a1ee3d34b'

* commit 'c9a13a289d0e1607387854127476813a1ee3d34b':
  lavc: remove old unused audio conversion functions.

Conflicts:
libavcodec/audioconvert.c
libavcodec/audioconvert.h

Merge only for metadata.
keeping the old API longer reduces the need for applications to be continuously
updated.

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

avformat/gxf: fix old codec id

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

avcodec: fix old codec ids

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

avcodec/dvdec: dont try to decode ac when theres no input

fixes reading out of an empty bitstream

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

avisynth: Factor out a couple of returns

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

avisynth: Simplify a stray av_log message

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

avisynth: Switch a couple of AVERROR_UNKNOWNs to AVERROR(ENOMEM)

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

avisynth: Use AV_* prefixes for video and audio IDs

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

avisynth: Remove outdated undef block

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

avisynth: Remove a couple of useless AviSynthContext casts

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

avisynth: Don't declare structs anonymously

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

avisynth: Compact AvxSynth's avoidance of 2.6's colorspaces.

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

avisynth: Cosmetics

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

avisynth: Change most of the comments to /* */ from //

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

avisynth: Introduce USING_AVISYNTH macro

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

mpegts: demux synchronous SMPTE 336M Key-Length-Value (KLV) metadata

Fixes ticket #2579.

avutil/opt: check flags validity in write_number()

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

avcodec/h263dec: fix handling of AV_EF_EXPLODE

This fixes checking a variable that had been overwritten before.

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

lavfi: do not export the filters from shared objects

lavf: do not export av_register_{rtp,rdt}_dynamic_payload_handlers from shared objects

lavc: remove old unused audio conversion functions.

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  ac3dec: fix outptr increment.

Conflicts:
libavcodec/ac3dec.c

No change as this has been fixed in ffmpeg head already

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

Merge commit 'a1c5cc429d99216406170eac7e8352860076d3e8'

* commit 'a1c5cc429d99216406170eac7e8352860076d3e8':
  lavc: don't set AVFrame.pts to random numbers in decoders.

Conflicts:
libavcodec/mpeg4videodec.c

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

Merge commit '2ba68dd044ca8fc591139c05563840f546a9c0c0'

* commit '2ba68dd044ca8fc591139c05563840f546a9c0c0':
  lavf: remove unreliable timestamp guessing heuristic

Conflicts:
libavformat/utils.c

Not merged, as the change breaks ABI by removing a field from the middle
of AVStream.
Also, if you have files that decode better or worse without this code please
open a ticket on trac. If the timestamp code turns out useless it of course
should be removed.

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

ac3dec: fix outptr increment.

Fixes corrupt data errors when downmixing in the AC-3 decoder.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
CC:libav-stable@libav.org

Merge commit 'f2521563d1a0c3e2a21892f59f3327b82b3db7fc'

* commit 'f2521563d1a0c3e2a21892f59f3327b82b3db7fc':
  g722dec: Change bits_per_codeword to the right option type

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

Merge commit '884c7a6eb86a9bc05abafc058b279018ded7de5f'

* commit '884c7a6eb86a9bc05abafc058b279018ded7de5f':
  avfilter: fix const use of avfilter_next

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

Merge commit '5c439b41d0489412c0a4cf6dfb98915251677b8e'

* commit '5c439b41d0489412c0a4cf6dfb98915251677b8e':
  avfilter: have avfilter_get_by_name return const for next bump

Conflicts:
libavfilter/version.h

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

Merge commit '97de206b44a48da726807cc3e7b9448a8112760b'

* commit '97de206b44a48da726807cc3e7b9448a8112760b':
  lavc: disable CRC checking by default

Conflicts:
libavcodec/options_table.h

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

Merge commit '23a211cbba0b7c9ee694040031b2e5da1be54a00'

* commit '23a211cbba0b7c9ee694040031b2e5da1be54a00':
  lavc: change all decoders to behave consistently with AV_EF_CRCCHECK.

Conflicts:
libavcodec/avcodec.h
libavcodec/tta.c

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

Merge commit 'f354f30836a3148275ce60d19bbc581310249ad2'

* commit 'f354f30836a3148275ce60d19bbc581310249ad2':
  error resilience: check error_concealment, not err_recognition.

Conflicts:
libavcodec/error_resilience.c

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

Merge commit '53151723e377b9c43f876e20d7f27a17993256c8'

* commit '53151723e377b9c43f876e20d7f27a17993256c8':
  avio: K&R formatting cosmetics

Conflicts:
libavformat/avio.c

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

Merge commit 'aaaf2dc023d31f30eeec874f24b50f44b9295185'

* commit 'aaaf2dc023d31f30eeec874f24b50f44b9295185':
  h263: Check init_get_bits return value

Conflicts:
libavcodec/h263dec.c

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

Merge commit '0749314886390f6ec81d45e0ba424fcb36c945cf'

* commit '0749314886390f6ec81d45e0ba424fcb36c945cf':
  h263: Return meaningful errors

Conflicts:
libavcodec/h263dec.c

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

Merge commit 'de6061203e2d509579ab110fb1873aade34320f5'

* commit 'de6061203e2d509579ab110fb1873aade34320f5':
  configure: Disable -Wmaybe-uninitialized by default

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

Merge commit '0b357a8095e72b092cc5c2aacc2f806db75ecae3'

* commit '0b357a8095e72b092cc5c2aacc2f806db75ecae3':
  AVOptions: do not range check flag options.

Conflicts:
libavutil/opt.c

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

Merge commit '94603feb1b3ad01a821a1a1cef1570b13f471821'

* commit '94603feb1b3ad01a821a1a1cef1570b13f471821':
  h264_ps: when parsing a VUI fails, only abort when explode is set

Merge only for metadata, ignoring invalid data can put the context
into an invalid state and can possibly be used for remote code
execution exploits.
Also we support all non standard VUIs that have been reported so
ignoring parsing failure makes no sense for us unless theres
some issue that has not been reported

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

Merge commit '79ef4b19bfcab8b984682a53bb8561e5c8324731'

* commit '79ef4b19bfcab8b984682a53bb8561e5c8324731':
  FATE: add bitexact sws flags to the fieldorder test

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

Merge commit 'ddc589ce98c2bba1e59318b5b0224717325eac46'

* commit 'ddc589ce98c2bba1e59318b5b0224717325eac46':
  avconv: drop a now useless variable

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

hevc: add profile idc warning
(cherry picked from commit 15f7a481fd19529b13631bfff5b3d65bfe5729d5)

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

hevc: refactor pic_arrays and set_sps
(cherry picked from commit a6686c6d83b50c0962269f2c487f4f0c57e0df79)

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

hevc: add irap checks
(cherry picked from commit 3d3bbe35541a308937d0fe72b20a1c29d1c4100d)

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

Merge commit '529a9893d769f381b72785c500662be2020da5fe'

* commit '529a9893d769f381b72785c500662be2020da5fe':
  avframe: mark source frame const in _ref and _clone

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

Merge commit 'fc06ee6ee377cc3b512dff8f02057e26311bc4da'

* commit 'fc06ee6ee377cc3b512dff8f02057e26311bc4da':
  mmvideo: fix uninitialized variable use in mm_decode_intra

Conflicts:
libavcodec/mmvideo.c

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

Merge commit '211ca69b13eb0a127a9ef7e70ddaccdab125d1c5'

* commit '211ca69b13eb0a127a9ef7e70ddaccdab125d1c5':
  lavr: check that current_buffer is not NULL before using it

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

cmdutils: fix expected signature for show_colors() function

Fix warning:
In file included from ffprobe.c:2557:0:
cmdutils_common_opts.h:17:5: warning: initialization from incompatible pointer type [enabled by default]
cmdutils_common_opts.h:17:5: warning: (near initialization for ‘real_options[16].u.func_arg’) [enabled by default]

Spotted-by: Paul B Mahol

lavc: don't set AVFrame.pts to random numbers in decoders.

lavf: remove unreliable timestamp guessing heuristic

g722dec: Change bits_per_codeword to the right option type

This isn't a set of flags but just a plain integer in the range
6-8.

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

avfilter: fix const use of avfilter_next

Signed-off-by: Anton Khirnov <anton@khirnov.net>

avfilter: have avfilter_get_by_name return const for next bump

Signed-off-by: Anton Khirnov <anton@khirnov.net>

lavc: disable CRC checking by default

lavc: change all decoders to behave consistently with AV_EF_CRCCHECK.

Just crccheck prints a warning, crccheck+explode returns an error.

Also document this behavior.

error resilience: check error_concealment, not err_recognition.

err_recognition is supposed to trigger detecting and reporting errors,
not trying to fix them.

doc/RELEASE_NOTES: update for 2.1

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

avdevice/pulse_audio_enc: remove double ;

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

doc/APIchanges: add 2 missing hashes & versions

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

MAINTAINERS: update which releases i maintain

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