bink: permute Bink version 'b' quant matrices by inverse scan order

This fixes visual glitches in Bink version 'b' files, as the quantization
tables were not being permuted.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 231539217431c32d4f22a16ee2834e24f54611f4)

bink: simplify how quantization matrices are passed to read_dct_coeffs()

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit cb62510cab8b745e65eb966c72ab7e9b122d564b)

Fix MMX rgb24 to yuv conversion with gcc 4.6

When built with gcc 4.6, the MMX rgb24 to yuv conversion gives
wrong output.  The compiler produces this warning:

libswscale/swscale_template.c:1885:5: warning: use of memory input without lvalue in asm operand 4 is deprecated

Changing the memory operand to a register makes it work.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit f344903ca5ce28a833fdd656bc1ed5b16d97e7e9)

movenc: Force first sample as SYNC

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 44b11207248c6ca6edb7d3469c0fbdca45dbfa70)

Make avfilter_config_links() propagate audio information of the source link if it is not explicitely set by the filter.

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

Restructure video filter implemenattion in ffmpeg.c.
This fixes several bugs like multiple outputs and -aspect mixed with -vf

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

Make truncated mpeg4 GOP header check a bit more specific.

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

Apply minor cosmetics fixes to the av_audio_resample_init() doxy.

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

Document audio_resample_close().

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

Detect null gop headers.
Fix issue2592. / mpeg4-bad-gvop.raw

Make tables generation insensitive to floating-point implementation

Using doubles make the double -> int cast well defined for all the values
used, with the exception of when s[i]==1.0, which is special-cased.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 47d62c965b7bcf4715127fbf9bffab7b4c5c88b7)

Fix script command in a FAQ entry

In the FAQ section "How do I encode single pictures into movies?", use
-s for generating symbolic links with the ln command.

The script was generating hard links, which is not likely what it was
supposed to do.

Fix issue 2488.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit e063f5886b27a7374f5060b7c2c21385685b2cb0)

Allow "make clean" to clean files in tools

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 40321376d8aea3347bec9c4d09925e8c5b8edb55)

Add lavfi-showfiltfmts and graph2dot to $(TOOLS)

Allow make clean to remove the corresponding binaries.

Fix issue 2162.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit cd6a5a57b820c5fe008ea0f91a727861b7b2a331)

Fix qtrle regression test, actually test qtrle.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 646739a0a8368bd234ff077c093bbf01e9e7f44a)

rtsp/rdt: Assign the RTSPStream index to AVStream->id

This is used for mapping AVStreams back to their corresponding
RTSPStream. Since d9c0510, the RTSPStream pointer isn't stored in
AVStream->priv_data any longer, breaking this mapping from AVStreams
to RTSPStreams.

Also, we don't need to clear the priv_data in rdt cleanup any longer,
since it isn't set to duplicate pointers.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit b2dd842d21a0b441bb9f7092357f479beb6b6f69)

Add check for Athlon64 and similar AMD processors with slow SSE2.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 74b1f96859eb967222fcb3eb4c72d949b5165a89)

configure: remove early check_deps $ARCH_EXT_LIST

The early disabling of irrelevant arch extensions is no longer
required, and removing it makes dependencies involving these
work as expected.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 4b884207eb7319577f8ceb94a56f42c5ac0ab294)

VP8: ARM optimised decode_block_coeffs_internal

Approximately 5% faster on Cortex-A8.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit a7878c9f73c12cfa685bd8af8f3afcca85f56a8b)

ARM optimised vp56_rac_get_prob()

Approximately 3% faster on Cortex-A8.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 7da48fd0111adf504cfcfc5ebda7fd0681968041)

Update overlay documentation after movie syntax update.

Overlay documentation is still using the old unsupported syntax.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit aa8ac53b51cd8b9446b50404660685041060fa4f)

bink: reindent after last commit

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit adb1ad0d8005dfcbae863bccdda8fdd26bb63f30)

Bink version 'b' video decoder

Based on original patch by Kostya Shishkov

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit e00f41d5742b3a0dc1877b030f4f6f58c19b7bbd)

lavf: deprecate AVFormatContext.index_built

it's not touched anywhere in ffmpeg, the code setting it was removed
over two years ago (e9b78eeba22b050810a507e69df1b652e56ab62b).

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit b0294c80d3a3981ec7ef9e4654962780e8566075)

Clarify that pts_correction* fields are internal to libavcodec
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Set maximum lowres value for the MJPEG decoder to 3.

While 4 works for some samples, 3 is the correct value since 8x8
DCT is used by (m)jpeg.

ffplay: stats: do not dereference NULL video

Also: cosmetic: split this overly long line

VP8: optimized mv prediction and decoding

Merge find_near_mvs and mv bitstream decoding: don't do prediction steps
until absolutely necessary.
(cherry picked from commit f3d09d44b70492022964e2ead5f439bb7c96eaa2)

ac3enc: Remove unneeded clipping of shift amount.

s->windowed_samples will always have a range of [-32767,32767] due to the
window function, so the return value from log2_tab() will always be in the
range [0,14].

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 626264b11b5406c0c78c4056cabb63cb650e9bf2)

ac3enc: remove right shifting from lshift_tab() and make lshift unsigned.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit d4582889eefeee4dd23face9e74b2829dbaaeae5)

asfdec: deobfuscate reading video properties size

This code will be later split out into a function which takes a 'size'
argument, so I'm keeping the name 'sizeX' here.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 0b1d291a716dd79ca6862a95baf9ac574feba885)

asfdec: split asf_read_header()

Only trivial splits are done here -- i.e. copy/paste + reindent +
missing variable declarations.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit c1fea2307011ac7a7bb98af98010f81abc789732)

wtv: mark streams intended for hearing or visual impaired persons

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 68137ba386933243a84fc65f0deb3ad0ce5ff0ea)

make av_find_best_stream() ignore streams marked with AV_DISPOSITION_*_IMPAIRED

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 52091491575f015c09a32a745de4f7f7592fe6d4)

add AV_DISPOSITION_HEARING_IMPAIRED and AV_DISPOSITION_VISUAL_IMPAIRED

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 12c14cd4a8bf844f6f3d16ae18999bdb47999324)

Remove final semicolon from some macros

This avoids double semicolons after macro expansion.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 44adbebe1744c68d66d7f811c38270fdcc89665a)

dvbsubenc: Fix placement of the object version

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit df211c3ab73b36208ac4511a9cd7feb817f551fa)

document passing the fate samples location via make variable
(cherry picked from commit 5c19f64c600ece050a1deb27f53963e4416beb31)

dvbsubdec: check against buffer overreads

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 493aa30adf88baf5bc734072592a22db586f0cfb)

Do not fail DVB sub decoding because of a few padding bytes

Instead of returning an error when bytes are left over, just return
the number of actually used bytes as other decoders do.
Instead add a special case so an error will be returned when none
of the data looks valid to avoid making debugging a pain.

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 4a72765a1c94b05bd3053b1f34f8457a3b71d714)

Add x86-optimized versions of exponent_min().

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit dda3f0ef48aa5c3b03566b60b6bf63211e1fe579)

Remove incorrect return statement from avcodec_thread_free()

The function return type is void, so a return statement with an
expression is forbidden (and pointless).

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit b4668274b944abae61759e796c5cc36ade510f24)

ivi_dsp: remove semicolons after function definitions

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit dbb09ec23f16cb5e4ec3d4e0911dae0beb95869b)

mov: remove stray semicolon

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 628b16f45f79aa5eb7514f11026d85e8aa34387f)

asfdec: skip the stream bitrate list

Its contents aren't used for anything.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit d7a5106eb2dad33765b0e5f11fd8b1a87e5a9b4b)

asfdec: use an ASFContext array for storing stream bitrates

This will be useful for splitting asf_read_header()

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 7c7253802bbb4f7330ff9b32358bf05f9880cbdf)

asfdec: move DAR list to ASFContext

This will be useful for splitting asf_read_header()

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit d42b09723ed154d5269b95efcc20cb1874f60816)

udp: Enable address reuse by default for multicast

Keep the original corner case behaviour, where reuse is enabled
for the case where no argument is given to the reuse url option.

Signed-off-by: Martin Storsjö <martin@martin.st>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 00952be424ba7403d71c338933354d2172df8e67)

asfdec: remove some write-only values from the context

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 569ff02168dfe618599db5d5a327caf8b3051dd5)

Fix build with threading disabled

The avcodec_thread_free() compatibility wrapper calls ff_thread_free(),
which is not defined when threading is disabled.  Make this call
conditional.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 9a77a92c2b6855781d2a4cfab14c67ae4025760c)

w32thread: add missing #include thread.h

This should fix building with win32 threads.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit aef669cdfd984a737ad876b33ee1b160f87f5f9a)

asf: split ASFContext into muxer and demuxer parts.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 4bc328a2bdf96d01afd3cf4532efb9db41f00985)

check sample_fmt in avcodec_open

check AVCodecContext->sample_fmt against AVCodec->sample_fmts[] to ensure
that the encoder supports the specified sample format. Error out if it doesn't.
Previously, it would continue and output garbage. Fixes issue 2587.
(cherry picked from commit 2cfa2d925808e6cc6fb7a7c133b7cb7622afd37e)

mpegts: remove unused macro MAX_SCAN_PACKETS

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit f4c79d1e0b2e797012304db57903e4091b0c2d7c)

vp3: Frame-based multithreading support

Decode times for big_buck_bunny_720p_stereo:

1 thread:
real    1m14.227s
user    1m13.104s
sys     0m1.108s

2 threads: (33% faster)
real    0m49.329s
user    1m33.735s
sys     0m1.834s

3 threads: (44% faster)
real    0m41.593s
user    1m44.884s
sys     0m1.967s
(cherry picked from commit d23845f311f04e98777612cae1b55e28923ccdc6)

Add missing git rev hash.
(cherry picked from commit f2146944fcd00a0a7918931c6f0f5c3f88cd6f1d)

Deprecate avcodec_thread_init()

As a side effect of the last commit, avcodec_open() now calls it automatically,
so there is no longer any need for clients to call it.
Instead they should set AVCodecContext.thread_count.

avcodec_thread_free() is deprecated, and will be removed from avcodec.h at the
next MAJOR libavcodec bump.

Rename the functions to ff_thread_init/free, since they are now internal.
Wrappers are provided to maintain API compatibility.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit c0b102ca03fe92250f1ce620aec3836f529fc1d6)

Add missing git rev hash.
(cherry picked from commit 8e8cc52be3b515bc91cd9452daca7a65feaea5ad)

Frame-based multithreading framework using pthreads

See doc/multithreading.txt for details on use in codecs.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>

Add missing git revision hask.
(cherry picked from commit c2bd7578af069206831a9c25fa68c9bbd5004619)

asf: make ff_guidcmp inline and move it to asf.h

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit e4e234fad77daa8628fc56155563248165d51ab4)

Update qmin/qmax values for libx264 presets

Also allow qmin/qmax to go up to 69 (the current max value for libx264).  This
will have to increase when we add 9/10-bit support.
(cherry picked from commit c7ac200d15e3240972d269df768068f0e3bb9c2f)

Fix broken vbv_buffer_init handling in libx264.c

Due to being pants-on-head retarded, libavcodec defaults this to zero, which
results in broken output.  This didn't affect ffmpeg.c, which sets it itself,
but caused problems for other calling apps using VBV.
(cherry picked from commit f7f8120fb9a06b5d7fbf5add48a0d8464319a332)

VP8: idct_mb optimizations

Currently uses AV_RL32 instead of AV_RL32A, as the latter doesn't exist yet.
(cherry picked from commit 62457f9052ea15123688455aad866cb070634f13)

Fix ff_emu_edge_core_sse() on Win64.

Fix emu_edge_v_extend_15 to be <128 bytes on Win64, by being more strict
on the size of registers and which registers are being used for operations
where multiple are available. This fixes segfaults in emulated_edge()
function calls on Win64.
(cherry picked from commit 17cf7c68ed26a4cb3c7adf7488a38c2e19118918)

lavf: rename ff_probe_input_buffer to make it public

It is useful for applications that hand input data directly to lavf via
a ByteIOContext.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 3940caad02fbc4f075e77bc605849b1d84ba1b8e)

lavf: simplify pb parameter of ff_probe_input_buffer

There is no need to pass the ByteIOContext via a pointer to a pointer
anymore.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit aad216fd7e3209fe0a865d8751e680925f6654d3)

lavf: update ff_probe_input_buffer documentation

It never reopens the bytestream anymore.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 4d016dd4e5b288b3c0c7396935326cb07a289ac2)

oggdec: Fix incorrect assumption about header/data interleaving

Currently (since the data_offset fix) the ogg demuxer assumes that
after the first non-header packets in any stream no more header packets
will follow.
This is not guaranteed, so change the code back again to wait until it
has finished the headers for all streams before returning from ogg_get_headers.

This fixes issue 2428.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 6bd69e6adadf645fd07e909bebc150eab4b9c3c8)

Fix HOSTLIBS on Haiku

Haiku does not have a separate libm, so do not try to link to it.

Signed-off-by: François Revol <revol@free.fr>
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit f59c4bd625839dbe1e099c6a8b38988108883623)

Documentation updates for the git migration

This cleanup patch updates the developer documentation with respect to
the migration to the git scm.
(cherry picked from commit 87800dc2bf8f2724a99e51bb079ad7fb4b9dfd3b)

logging: downgrade recoverable errors to warnings

In all 3 cases, the decoding continues and thus a warning would be sufficient.
Helps application that catch them with own log handers to handle them
accordingly.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit ae2104791ffa8466d3f6972ed0793b2a165daabe)

add APIChanges entry for fe9a3fb
(cherry picked from commit 7ab8758baf743b3d525c07a770e13038b0885461)

h264: define FF_PROFILE_H264_HIGH_444 to the correct value

It was removed in fe9a3fb since it had the wrong value. Add profile name
for it.
(cherry picked from commit 440b61691db2166abac3f58e01da1d4722f1f1e4)

libavfilter: add video movie source

See thread:
Subject: [PATCH] movie video source
Date: 2010-12-31 15:35:30 GMT

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>

Apply misc fixes to the image2 muxer documentation.

The fixes were pointed out by Diego.

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 0cad24ce9b02037c9cdad84cae905f96b04d7d4c)

Add documentation for the framecrc muxer.

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 77d4ed7a127b88f9b8ddd741c65e678198feb285)

Add documentation for the crc muxer.

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit a4effe432f4aa59d52465b88589f92addf3afd3e)

Document null muxer.

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit f4acb837eb4af74996b678f3f55eaa66c47a66ee)

VP8: ARM NEON optimisations for dsp functions

This adds NEON optimised versions of all functions in VP8DSPContext.
Based on initial work by Rob Clark.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit a1c1d3c003b0ec16fdb6574913781313fb2c7ab6)

Remove Xan WC4 cruft from xan.c

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 90e8a9c34f641d0cb9137190c1912a3da3095e01)

Xan4 decoder

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 44ddfd47d671d2587903d94c8b565f68f45bd4bc)

matroskadec: add generic element length validation.

This validate the length of a mkv element directly after reading
it.
This has the advantage that it is easy to add new limits and makes
it less likely to forget to add checks and also avoids issues like
bits of the length value above the first 32 being ignored because
the parsing functions only takes an int.
Previously discussed in the "mkv 0-byte integer parsing" thread.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 95ec3d4cacd084e2448c3a1aba420e7d8f00e19b)

Fix compile warning.

Change int64_t into a int, which caused this compiler warning:
libavformat/oggparseskeleton.c:64: warning: passing argument 2 of ‘av_reduce’ from incompatible pointer type
(cherry picked from commit 69ff14920429c9e128a8bcf65ce3f4b4aa93f3d1)

avidec: simplify read_gab2_sub

Use avio functions instead of bytestream ones (also drops dependency on
lavc and removes a bunch of warnings).
Drop custom version of avio_get_str16 and use that instead.

Tested on mewmew-ssa.avi sample.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 47fdf00a77e82a0e30422ed08d5b295e9ae8d506)

lavf: move internal functions from avformat.h to internal.h

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 19711af5cdc364f9e02ea8103dd6e1e09dc288a4)

Make av_set_pts_info keep previous time base if new one is invalid.

Fixes issue 2475.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit b3190529dfefe3226302b23e76e16c631cde6649)

pass QDMC extradata to the decoder

Makes playing QDMC files in MPlayer work when using the libavformat demuxer.
Problem was that the extradata was not passed from demuxer to decoder.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit ed19fafd486d6ab0d6e1eba80ceaa482a740c556)

configure: check yasm/nasm for working pextrd opcode

NASM versions older than 2.08 fail to build ffmpeg with several
"error: operation size not specified" errors but this is not caught in
configure.

Fix that by checking if "pextrd [eax], xmm0, 1" works in configure.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 48545a8f724247853c5b1d4e0a24e3ea3ee06515)

vorbis dec: Remove obsolete comment

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

vorbis dec: cosmetics: Indent CPP cond properly

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

vorbis dec: cosmetics: Indent consistently

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

vorbis dec: cosmetics: Indent after scope deletion

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

vorbis dec: Delete useless scopes

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

Implement guessed_pts in avcodec_decode_video2

Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

dvdsubdec.c: prevent input buffer overflow

In some places, dvbsubdec passes improper input buffer size to
bitstream reading functions, not accounting for reading pointer
updates.

Fixed by using buffer_end - buffer pointer instead of fixed buffer length.

Signed-off-by: Jindrich Makovicka <makovick@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Make inter_rvlc and intra_rvlc static tables.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 84ae8936f642042fe7ad3466ce3a26dec77016f1)

Fill in missing date.
(cherry picked from commit ae0f8a1a33158397c5014745424389ba1f543cfd)

Update MINOR and set git rev for non-blocking flag API addition.
(cherry picked from commit efdd67cb00ad770c16c47161c023121e1ae53ae9)

Replace remaining occurrences of deprecated CH_* with AV_CH_*

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit c2fcd0a7a4d0bda1a3306e40b70ce281a987df60)