Merge commit '6d592fbd0d8e89ecade3fc93b36ea200213dc01c'

* commit '6d592fbd0d8e89ecade3fc93b36ea200213dc01c':
  avconv: split creating and (re-)configuring complex filtergraphs

Conflicts:
ffmpeg_filter.c
ffmpeg_opt.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>

avfilter: Add reverse filter

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

Merge commit 'be101bc1e357c50fcb740bc4870b3bacc93a5727'

* commit 'be101bc1e357c50fcb740bc4870b3bacc93a5727':
  avconv: create the complex filtergraphs earlier

Conflicts:
ffmpeg_opt.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>

Merge commit '1959351aecf09fc3e90208ff775f4849801dc13f'

* commit '1959351aecf09fc3e90208ff775f4849801dc13f':
  avconv: move the no streams failure to open_output_file()

Merged-by: Michael Niedermayer <michael@niedermayer.cc>

Merge commit 'ab7b038906f3e40ed474676d8e3029902a2078f5'

* commit 'ab7b038906f3e40ed474676d8e3029902a2078f5':
  avconv: factor out the output stream initialization

Conflicts:
ffmpeg.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>

Merge commit 'bd2ab27c488ae92c7820efe11d4f53d84e94d58e'

* commit 'bd2ab27c488ae92c7820efe11d4f53d84e94d58e':
  avconv: use read_file() for reading the 2pass stats

Conflicts:
cmdutils.c
cmdutils.h
ffmpeg_opt.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>

Merge commit '6d5d9246042acb804a652e6fedfb7afe0ca85614'

* commit '6d5d9246042acb804a652e6fedfb7afe0ca85614':
  avconv: move handling the 2pass logfile into avconv_opt

Conflicts:
ffmpeg.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>

Merge commit '59245e0c5e10a849e67c632cccf4f677b2442e82'

* commit '59245e0c5e10a849e67c632cccf4f677b2442e82':
  avconv: set the encoding/decoding_needed flags earlier

Conflicts:
ffmpeg.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>

ffmpeg_opt: Fix stream copy flag for attachments

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Merge commit '56c2f37727015212a404cae0f444d8bc8704d691'

* commit '56c2f37727015212a404cae0f444d8bc8704d691':
  avconv: drop update_sample_fmt()

Conflicts:
ffmpeg.c

No change as the removed code is not in FFmpeg

Merged-by: Michael Niedermayer <michael@niedermayer.cc>

Merge commit 'e61f39849c2e2b7f492c17b42058242ed2fa4d57'

* commit 'e61f39849c2e2b7f492c17b42058242ed2fa4d57':
  asfdec: make nb_sub to be unsigned int

Merged-by: Michael Niedermayer <michael@niedermayer.cc>

Merge commit '2883ef34b59c9b427c4cfad4620c3235e5778406'

* commit '2883ef34b59c9b427c4cfad4620c3235e5778406':
  asfdec: read the replicated data in a separate function

Merged-by: Michael Niedermayer <michael@niedermayer.cc>

Merge commit '0989d3ad1fbd7509815208b0a5792918492d2a68'

* commit '0989d3ad1fbd7509815208b0a5792918492d2a68':
  asfdec: convert condition for the replicated data reading to be safer

Merged-by: Michael Niedermayer <michael@niedermayer.cc>

Merge commit '406627287e015ce381795e85e2557b12bf60ca35'

* commit '406627287e015ce381795e85e2557b12bf60ca35':
  asfdec: do not read replicated data when their length is 0

Merged-by: Michael Niedermayer <michael@niedermayer.cc>

avconv: split creating and (re-)configuring complex filtergraphs

The current code is less than straightforward due to the fact that
output streams can be created based on filtergraph definitions. This
change should make the code simpler and more readable. It will also be
useful in the future commits.

avconv: create the complex filtergraphs earlier

Since global options are processed before all the other options now, we
do not have to try creating the complex filtergraphs several times
anymore, it is enough to do it once after the input files are opened.

avconv: move the no streams failure to open_output_file()

It is a better place for it, there is no reason to wait until
transcode_init().

avconv: factor out the output stream initialization

avconv: use read_file() for reading the 2pass stats

Also, drop the now unused cmdutils_read_file(). There is no reason to
have two functions doing essentially the same thing.

avconv: move handling the 2pass logfile into avconv_opt

It more logically belongs there.

avconv: set the encoding/decoding_needed flags earlier

This will be useful in the following commits.

avconv: drop update_sample_fmt()

There is only one decoder left that supports this (libopus, which is not
used by default since we have a native one) and this code goes against
the avconv design, since it propagates information back from the encoder
to decoder.

asfdec: make nb_sub to be unsigned int

number of subpayloads should be always positive

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

asfdec: read the replicated data in a separate function

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

asfdec: convert condition for the replicated data reading to be safer

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

asfdec: do not read replicated data when their length is 0

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

avcodec/hevc_parser: Treat extradata parsing differently, as it should not contain an AU

Fixes ticket4718

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avutil/x86/bswap: force inline asm versions with ICC

Recent ICC versions that define GCC as >= 4.5 (like ICC 13) apparently can't
optimize the generic C versions of av_bswap*() on their own.

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

avutil/intmath: check for ICC before GCC

Intel compiler also defines __GNUC__, so the Intel specific intrinsics were not
really being used.

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

avfilter/vf_blend: unbreak tblend

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

fate: add tblend filter test

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

avformat/mpegtsenc: Add sdt_period, similar to pat_period

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avformat/mpegtsenc: Support a user specified PAT/PMT period

Can be used to fix Ticket3714

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avformat/mpegtsenc: support storing PAT/PMT per frame

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

doc/developer: add url for sample files

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avfilter/vf_blend: implement 16bit support

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

fate: add test for mergeplanes filter

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

avcodec/vp8: Check buffer size in vp8_decode_frame_header()

avoids null pointer dereference
Fixes: signal_sigsegv_d5de40_964_vp80-00-comprehensive-010.ivf with memlimit of 1048576
Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avcodec/vp8: Fix null pointer dereference in ff_vp8_decode_free()

Fixes: signal_sigsegv_d5de23_967_vp80_00_comprehensive_010.ivf with memlimit 524288
Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avcodec/diracdec: Check for hpel_base allocation failure

Fixes null pointer dereference
Fixes: signal_sigsegv_b02a96_280_RL_420p_ffdirac.drc with memlimit of 67108864
Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avformat/movenc: Drop redundant bit exact field from context

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avcodec/rv34: Clear pointers in ff_rv34_decode_init_thread_copy()

Avoids leaving stale pointers
Fixes: signal_sigabrt_7ffff70eccc9_819_sabtriple.rm with memlimit 536870912
Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avutil/frame: Update AVFrame docs library references

These where apparently forgotten when AVFrames where moved into libavutil

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avfilter/af_dynaudnorm: Use av_frame_get_channels()

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avcodec/hevc_ps: Also print depth in failure path of map_pixel_format()

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avformat: increase first_frames threshold for mp3,ac3

Fixes Ticket4723

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Merge commit 'c9f8cfb6d9b34f3c51f1b7152c4dc3f2f8724dc4'

* commit 'c9f8cfb6d9b34f3c51f1b7152c4dc3f2f8724dc4':
  fate: add checkasm target

Merged-by: Michael Niedermayer <michael@niedermayer.cc>

Merge commit '82e6ac85ff9aa7631b8c01521b3d6b5ca0bc8014'

* commit '82e6ac85ff9aa7631b8c01521b3d6b5ca0bc8014':
  checkasm: test all architectures with optimisations

Merged-by: Michael Niedermayer <michael@niedermayer.cc>

Merge commit 'cb33f8d0f48b1e9d642ca1cbea142dcbedd08a27'

* commit 'cb33f8d0f48b1e9d642ca1cbea142dcbedd08a27':
  checkasm: Give macro a body to avoid potential unexpected syntax issues

See: a39512ba9e0c0f0e96d872af1c087f07322818fa
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

Merge commit '6cc4d3e9a982e926494f4b919d9733fe29774acf'

* commit '6cc4d3e9a982e926494f4b919d9733fe29774acf':
  checkasm: exit with status 0 instead of 1 if there are no tests to perform

Merged-by: Michael Niedermayer <michael@niedermayer.cc>

Merge commit '256ef19844892c6cf8e0386e3287bae970ec6320'

* commit '256ef19844892c6cf8e0386e3287bae970ec6320':
  h264: arm: use intra pred8x8 functions only for chroma_format_idc <= 1

Conflicts:
libavcodec/arm/h264pred_init_arm.c

See: 565cabf5c80b25d86c2e539afcb3b24024fbce0a
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

Merge commit 'fc56868399213d3e9be19bdebeb64df233b39a7e'

* commit 'fc56868399213d3e9be19bdebeb64df233b39a7e':
  cosmetics: Reformat checkasm tests

Merged-by: Michael Niedermayer <michael@niedermayer.cc>

avformat/async: support filling with a background thread.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

fate: add checkasm target

checkasm: test all architectures with optimisations

checkasm: Give macro a body to avoid potential unexpected syntax issues

checkasm: exit with status 0 instead of 1 if there are no tests to perform

h264: arm: use intra pred8x8 functions only for chroma_format_idc <= 1

Merge commit 'd37f23263584774e1798e9ac909a398304a05091'

* commit 'd37f23263584774e1798e9ac909a398304a05091':
  checkasm: Add unit tests for bswapdsp

Merged-by: Michael Niedermayer <michael@niedermayer.cc>

Merge commit 'a344e5d094ebcf9a23acf3a27c56cbbbc829db42'

* commit 'a344e5d094ebcf9a23acf3a27c56cbbbc829db42':
  x86: bswapdsp: Don't treat 32-bit integers as 64-bit

Conflicts:
libavcodec/x86/bswapdsp.asm

Merged-by: Michael Niedermayer <michael@niedermayer.cc>

Merge commit 'f5ee23004d1177ca6dd99b92cb4ff4b94b2eae09'

* commit 'f5ee23004d1177ca6dd99b92cb4ff4b94b2eae09':
  configure: Factor out g722dsp module

Conflicts:
configure
libavcodec/arm/Makefile

Merged-by: Michael Niedermayer <michael@niedermayer.cc>

Merge commit 'a623aa0069dff586241ad2ffedcd45ed840e2553'

* commit 'a623aa0069dff586241ad2ffedcd45ed840e2553':
  configure: Factor out wmv2dsp module

Conflicts:
libavcodec/Makefile

Merged-by: Michael Niedermayer <michael@niedermayer.cc>

Merge commit 'd42191c78befc1983f23b1899b2dda513b72f1ed'

* commit 'd42191c78befc1983f23b1899b2dda513b72f1ed':
  configure: Factor out vp8dsp module

Conflicts:
configure
libavcodec/Makefile
libavcodec/x86/Makefile

Merged-by: Michael Niedermayer <michael@niedermayer.cc>

Merge commit 'd4aea1aa4060fb5ba7f5f426823b697d2a5af08b'

* commit 'd4aea1aa4060fb5ba7f5f426823b697d2a5af08b':
  configure: Factor out vp56dsp module

Merged-by: Michael Niedermayer <michael@niedermayer.cc>

Merge commit '5cb4bdb2a03c3643f8f1e7d21d7094e61e0a4418'

* commit '5cb4bdb2a03c3643f8f1e7d21d7094e61e0a4418':
  configure: Factor out rv34dsp module

Conflicts:
libavcodec/Makefile
libavcodec/x86/Makefile

Merged-by: Michael Niedermayer <michael@niedermayer.cc>

avcodec/libx264: fix MPEG2 support

Found-by: rcombs
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Merge commit '575ec60e542114b2ef5b2f88b28eeb72389dda45'

* commit '575ec60e542114b2ef5b2f88b28eeb72389dda45':
  configure: Factor out mss34dsp module

Conflicts:
libavcodec/Makefile

Merged-by: Michael Niedermayer <michael@niedermayer.cc>

Merge commit '2edc77dc7be5f4a006c6295f4c827e5471f85262'

* commit '2edc77dc7be5f4a006c6295f4c827e5471f85262':
  configure: Factor out ividsp module

Merged-by: Michael Niedermayer <michael@niedermayer.cc>

Merge commit 'b075869bc1e1aadea0a8dc819ebfb758adb9e3d0'

* commit 'b075869bc1e1aadea0a8dc819ebfb758adb9e3d0':
  configure: Factor out flacdsp module

Conflicts:
configure
libavcodec/Makefile
libavcodec/arm/Makefile

Merged-by: Michael Niedermayer <michael@niedermayer.cc>

Merge commit '4da585ae478f8b6f865ab13779af399aee20d899'

* commit '4da585ae478f8b6f865ab13779af399aee20d899':
  OS/2: Cleanup slib_create_def_cmd

See: 22a0387df29c7450f57d09fbb24b7bc5f3b1fb89
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

cosmetics: Reformat checkasm tests

Merge commit 'e1319aa1c1be9b64117c19170344fb78841dd67c'

* commit 'e1319aa1c1be9b64117c19170344fb78841dd67c':
  libx264: Add support for the MPEG2 encoder

Conflicts:
configure
libavcodec/Makefile
libavcodec/libx264.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>

avfilter/af_dynaudnorm: Fix "ISO C90 forbids mixed declarations and code" warnings

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avfilter/af_aresample: Check ff_all_* for allocation failures

Fixes: signal_sigabrt_7ffff70eccc9_498_divx502.avi with memlimit 1572864
Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

checkasm: Add unit tests for bswapdsp

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

x86: bswapdsp: Don't treat 32-bit integers as 64-bit

The upper halves are not guaranteed to be zero in x86-64.

Also use `test` instead of `and` when the result isn't used for anything other
than as a branch condition, this allows some register moves to be eliminated.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

configure: Factor out g722dsp module

configure: Factor out wmv2dsp module

configure: Factor out vp8dsp module

configure: Factor out vp56dsp module

configure: Factor out rv34dsp module

configure: Factor out mss34dsp module

configure: Factor out ividsp module

configure: Factor out flacdsp module

Merge commit '0cf5588d69922aa3e063bac6304c09c543a9ef52'

* commit '0cf5588d69922aa3e063bac6304c09c543a9ef52':
  hq_hqa: Fix decoding when INFO section is absent

Merged-by: Michael Niedermayer <michael@niedermayer.cc>

Merge commit 'a53540840d26beb57a5e53b7f488c23ddf86e193'

* commit 'a53540840d26beb57a5e53b7f488c23ddf86e193':
  APIchanges: Mention lavfi and lavd identification symbol addition

Conflicts:
doc/APIchanges

No change as these symbols have been added a very long time ago to FFmpeg
and are already listed in APIchanges

Merged-by: Michael Niedermayer <michael@niedermayer.cc>

Merge commit 'f1840b070dd449ad25e1ebbab463f10863a5e0f1'

* commit 'f1840b070dd449ad25e1ebbab463f10863a5e0f1':
  Revert "mov: Double-check that alias path is not an absolute path"

Conflicts:
libavformat/mov.c

See: c9c7263e5820c957598643216c42be9b1c4f2d2b
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

Merge commit 'b0017579b6e8de3d0d13dcfe0a4dd848dc6baa37'

* commit 'b0017579b6e8de3d0d13dcfe0a4dd848dc6baa37':
  h264: Add support for Closed Caption export

Conflicts:
libavcodec/h264.c
libavcodec/h264_sei.c

See: 8234f0e3b485811d60c228c40a94a141c46e61ca
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

avfilter: bump minor and add Changelog entry

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

avfilter/af_compand: fix clipping with default options

Decays and attacks where by default set only for first channel
which caused poor defaults to be used which produced clipping
on any higher channel.

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

avfilter: add Dynamic Audio Normalizer filter

avfilter/af_astats: measure minimal and mean difference between two consecutive samples

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

OS/2: Cleanup slib_create_def_cmd

Export symbols by name rather then ordinal.
Remove PROTMODE directive as it does not make sense for 32 bit library.
Also silences a warning from some linkers.

Signed-off-by: Dave Yeo <dave.r.yeo@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

libx264: Add support for the MPEG2 encoder

hq_hqa: Fix decoding when INFO section is absent

APIchanges: Mention lavfi and lavd identification symbol addition

Revert "mov: Double-check that alias path is not an absolute path"

This reverts commit 9286de045968ad456d4e752651eec22de5e89060.
The change broke support for legit absolute file paths.

Reported-by: Maksym Veremeyenko <verem@m1stereo.tv>.

h264: Add support for Closed Caption export

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>

Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  lavfi/af_pan: Support a maximum of 64 channels.
  lswr: Allow 64 channels internally.
  lavc: Allow 64 channels internally.

Merged-by: Michael Niedermayer <michael@niedermayer.cc>

lavfi/af_pan: Support a maximum of 64 channels.

The Soundflower input device supports 64 channels.