rpl: Dont fill the index with entries that failed to be parsed

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7fd10a199a3c_6204_landing.rpl
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

libavformat/mpegts: expose raw packet size

We cannot easily determine if an mpeg TS's packet size is DVHS, FEC
or so on, for that we need to expose the internal raw_packet_size
field.

Signed-off-by: Leandro Dorileo <leandro.maciel.dorileo@intel.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avformat/dxa: check avio_read() return

Fixes use of uninitialized memory
Fixes msan_uninit-mem_7fd4d4323ddd_2453_MUSOSP1.dxa
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/dxa: check for overread in decode_13()

Fixes use of uninitialized memory
Fixes part of msan_uninit-mem_7f5ea8284fb7_8317_scummvm.dxa
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/dxa: add padding to decomp_buf

Fixes use of uninitialized memory
Fixes part of msan_uninit-mem_7f5ea8284fb7_8317_scummvm.dxa
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/flashsv: check decode_hybrid() for overread

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f906558274e_268_14_244486_2009_04_28.flv
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

lavfi/deshake_opencl: optimze transform filter

Reviewed-by: Wei Gao <highgod0401@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avformat/swfdec: clear 4 bytes at the end of a packet if they are not initialized

Fixes use of uninitialized memory
Fixes part of msan_uninit-mem_7f055dd0ab1b_9558_videopop_guitar_300k.swf
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avformat/swfdec: check avio_read() return code

Fixes use of uninitialized memory
Fixes part of msan_uninit-mem_7f055dd0ab1b_9558_videopop_guitar_300k.swf
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  fate: Explicitly specify the pixel format for the pngparser test

Conflicts:
tests/fate/image.mak

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

avformat/swfdec: check avio_read() return code

Fixes use of uninitialized memory
Fixes msan_uninit-mem_7f90d9cce964_9558_videopop_guitar_300k.swf
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/interplayvideo: Check that enough data is available for opcode_0x7/8/D

Fixes hypothetical use of uninitialized memory, no sample available

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

avcodec/interplayvideo: Check that enough data is available for opcode_0x9

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7fd5185b45df_5895_interplay-logo-2MB.mve
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/interplayvideo: Check that enough data is available for opcode_0xA

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f90e5be6b30_3965_baldursgate_camp.mve
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avformat/ipmovie: Check palette size in OPCODE_SET_PALETTE

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

avformat/ipmovie: Check that OPCODE_SET_PALETTE size is large enough

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7fec1f40656c_4819_descent3_level5_16bit_partial.mve
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avformat/ipmovie: remove superflous ()

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

avformat/ipmovie: Check that the OPCODE_INIT_AUDIO_BUFFERS size is large enough

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f75b03c1f19_4820_descent3_level5_16bit_partial.mve
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/pngdec: fix signed overflow

fixes fate ftrapv failure

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

fate: Explicitly specify the pixel format for the pngparser test

The RGB32 pixel format is RGBA/BGRA depending on target
endianness - make sure to convert it to one specific format for
the framecrc tests.

This fixes the pngparser fate test on big endian.

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  Prepare release notes for Libav 10 "Eks"

Conflicts:
doc/RELEASE_NOTES

Not merged because all that stuff has been in past releases

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

avformat/isom: zero MPEG4AudioConfig to avoid leaving fields uninitialized

Fixes: use of uninitialized memory
Fixes: msan_uninit-mem_7f392c443e0d_1433_Crowd_Applause_01.caf
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/nuv: zero buffer padding

Fixes use of uninitialized memory
Fixes msan_uninit-mem_7f4a141261de_7405_nirvana.nuv
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/dirac_dwt: initialize support value for fidelity wavelet

Avoids use of uninitialized memory
Fixes: msan_uninit-mem_7f15e1988a6e_2748_RL_420p_ffdirac.drc
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Prepare release notes for Libav 10 "Eks"

Additional editing by Diego Biurrun

lavf/concatdec: fix crash in case a file in script cannot be opened

lavf/segment: increase logging level for message with segment start information

Help debugging.

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  png_parser: Fix parsing on big endian

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

Merge commit 'd8fd183683b7495566b7e510a6536ae2efe8dfed'

* commit 'd8fd183683b7495566b7e510a6536ae2efe8dfed':
  vc1: Fix mb_height for field pictures

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

png_parser: Fix parsing on big endian

Since pc.state is populated by shifting in from the end of the
32 bit word, the content within pc.state is already in native endian
and should not be read with the AV_R{L,B} functions.

This was already done correctly for state64 above.

This fixes the fate-corepng test on big endian.

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

avcodec/aacdec: default to non-wide 7.1 in non-strict mode

AAC specification has 7.1(wide) as a default layout for 8-channel
streams (channel config 7). However, at least Nero AAC encoder encodes
non-wide 7.1 streams using the default channel config 7, mapping the
side channels of the original audio stream to the second
AAC_CHANNEL_FRONT pair in the AAC stream. Similarly, e.g. FAAD decodes
the second AAC_CHANNEL_FRONT pair as side channels, therefore decoding
the incorrect streams as if they were correct (and as the encoder
intended).

FFmpeg currently decodes such files by-the-spec, i.e. after decoding the
original front pair will be in AV_CH_FRONT_x_OF_CENTER and the original
side pair will be in AV_CH_FRONT_x.

As actual intended 7.1(wide) streams are very rare while misencoded 7.1
files actually exist in the wild, default to assuming a 7.1 layout was
intended unless in strict mode.

Fixes playback of e.g. 8_Channel_ID.m4a in samples.

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

Revert "Merge commit '3bc2e89c76e88ae6f1fd5287e0b11abcfc3c601c'" (Bump libavutil major version to account for the LLS API/ABI changes.)

This reverts commit 792845e436ddc5f3ce11ba02535a3372919061f2, reversing
changes made to 1d6666a6b828cca6c6b355a9b62f25607b1ced08.

Bumping libavutil requires all libraries that use libavutil to have their
major version bumped (yes breakage has been confirmed this is not a hypotheses)

One case of breakage is due to new types being added to AVOptions and
applications that linked to old libavutil and libswresample
then trying to use old libavutil (its soname changed so the old isnt updated)
and new swresample (its soame didnt change so it is updated)
the new swresample contains AVOption types that the old libavutil doesnt
know of thus the application attempting to access these avoptions
fails

AVOptions are used by all libs so the issue can potentially happen with
any other lib, libswresample was just the first that showed the problem
ive not checked if the other libs are affected currently by the same issue
or not

Also in addition to AVOptions, AVFrames are also defined in
libavutil, bumping it without all libs that use AVFrames could lead to
serious inconsistencies when 2 libs/app end up using 2 different libavutils

The alternative of bumping all is still possible after this revert, if it
turns out to be the preferred solution

avcodec/vc1dec: use av_mallocz for luma_mv

This ensures that no mvs are uninitialized at the time of loop filtering
Fixes: msan_uninit-mem_7f0b6dfe293c_2786_SA20021.vc1
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

vc1: Fix mb_height for field pictures

Tables are always allocated now with sufficient space for either progressive
or interlaced content. The alternative would be to detect a change
and reallocate.

This fixes decoding of a sample.

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  apidoc: fix warning from stereo3d.h

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

Merge commit '3d9fc21e593aa89b5877bd739268499b079052f2'

* commit '3d9fc21e593aa89b5877bd739268499b079052f2':
  h264: Refactor decode_frame_packing_arrangement

Conflicts:
libavcodec/h264_sei.c

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

Merge commit '3a149e23d37f06d49ab0bb013a3b9cb0224bba5c'

* commit '3a149e23d37f06d49ab0bb013a3b9cb0224bba5c':
  hevc: Refactor decode_nal_sei_frame_packing_arrangement

Conflicts:
libavcodec/hevc_sei.c

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

Merge commit 'cfb4ee30977732674d30c20e93a761c33c743972'

* commit 'cfb4ee30977732674d30c20e93a761c33c743972':
  fate: add a pngparser test

Conflicts:
tests/fate/image.mak

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

Merge commit 'eddff165b4cdc1f064245a4bad6f4265581c12b1'

* commit 'eddff165b4cdc1f064245a4bad6f4265581c12b1':
  fate: add utility function to test parser, demuxer, and decoder

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

Merge commit '6fd99e78def3c795bdd0bc31f3ae0998d24bc94c'

* commit '6fd99e78def3c795bdd0bc31f3ae0998d24bc94c':
  png: add a standalone parser

Conflicts:
Changelog
libavcodec/png_parser.c
libavcodec/version.h

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

avcodec/utils: drop 2 dependancies on sizeof(AVFrame)

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

avcodec/libvorbisenc: drop dependancy on sizeof(AVFrame)

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

ffprobe: drop dependancy on sizeof(AVFrame)

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

avcodec/flashsv2enc: drop dependancy on sizeof(AVFrame)

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

avcodec/j2kenc: drop dependancy on sizeof(AVFrame)

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

avcodec/libopenjpegenc: drop dependancy on sizeof(AVFrame)

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

avcodec/mjpegenc: drop dependancy on sizeof(AVFrame)

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

avcodec/msvideo1enc: drop dependancy on sizeof(AVFrame)

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

avcodec/diracdec: avoid depending on sizeof(AVFrame)

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

avcodec/svq3: set last/next frames to defaults before use

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

avcodec/utils: implement avcodec_alloc_frame() through av_alloc_frame()

This ensures that theres just one AVFrame allocation function and libs dont
produce multiple AVFrame variants after a minor lib update

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

avcodec: use av_frame_unref() to set frame defaults

This ensures that the code isnt duplicated and cant become out of sync

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

apidoc: fix warning from stereo3d.h

h264: Refactor decode_frame_packing_arrangement

Directly set the fields when necessary.

hevc: Refactor decode_nal_sei_frame_packing_arrangement

Directly set the fields when necessary.

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

fate: add a pngparser test

fate: add utility function to test parser, demuxer, and decoder

png: add a standalone parser

Useful for reading png images from a pipe.

avcodec/gifdec: check that the correct number of bytes was decoded

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f084c646637_9261_top_title_green_frog.gif
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

UDP: join multicast group on the interface specified with &localaddr=

When joining multicast groups, ffmpeg was using INADDR_ANY as interface address
which leads to enabling the multicast group on the interface with "default gateway".
Often multicast traffic is received over dedicated interface, which scenario ffmpeg was
unable to handle. With this patch, ffmpeg will enable multicast group to the interfaces
configured with address specified in &localaddr= parameter of udp:// URL. To avoid
loacal_addr resolve at udp_close(...) the UDPContext structure was extended with
struct sockaddr_storage local_addr_storage member, which is populated in udp_open(..)
and passed to udp_join_multicast_group()  and udp_leave_multicast_group().

Signed-off-by: Stoian Ivanov <s.ivanov@teracomm.bg>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avformat/format: av_register_output_format() and av_register_intput_format() that work in O(1) time

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

avcodec/utils: av_register_codec & hwaccel() that work in O(1) time

Its possible to implement this with a few lines less code but it then
would flip the order of the list and require registration of external
codecs to be done first, also it could break user applications due to
this. Thus to maintain ABI this slighty more complex solution is
used.

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avutil: Remove deprecated intfloat_readwrite code

Conflicts:
libavutil/intfloat_readwrite.c
libavutil/intfloat_readwrite.h

The files are left in place as they are still used by some projects
mplayer is one.
Theres no hurry in removing the code, it can as well be removed once
no projects use it anymore

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

Merge commit '11bb5e10c36539bcc303ceaac6f88d9ecb66e07f'

* commit '11bb5e10c36539bcc303ceaac6f88d9ecb66e07f':
  build: Define __printf__ to __gnu_printf__ on MinGW*/gcc

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

Merge commit '6d3ea1957f681b3bf9c752e6d21a501cc8d4180d'

* commit '6d3ea1957f681b3bf9c752e6d21a501cc8d4180d':
  Bump major of libavfilter for reference counted buffer API changes.

Conflicts:
libavfilter/version.h

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

Merge commit '3bc2e89c76e88ae6f1fd5287e0b11abcfc3c601c'

* commit '3bc2e89c76e88ae6f1fd5287e0b11abcfc3c601c':
  Bump libavutil major version to account for the LLS API/ABI changes.

Conflicts:
libavutil/version.h

Bump done to stay compatible with libav, its not neccessary otherwise for ffmpeg
as we have the new ABI/API under LLS2 and the old (unused) under LLS

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

ffserver: extend report_config_error() facilities, and use it for warnings

ffserver: add stream Metadata option

Also deprecate Author, Comment, Copyright, and Title options, and update
docs to use the new Metadata option.

ffserver: fix spacing typoin error message

lavu/dict.h: extend/clarify av_dict_get() doxy

lavfi/buffersrc: set min and max values for pix_fmt option

Currently the min and max values are not honored, but this will change in
a following patch.

avutil: Remove deprecated intfloat_readwrite code

It was deprecated over two years ago.

avcodec/libx264: Set colorspace details correctly

After adding colorspace support to xine-lib, I insist in proper
settings within media files at least when they do not follow
that implicit SD/HD routine.

build: Define __printf__ to __gnu_printf__ on MinGW*/gcc

This is necessary to avoid GCC assuming MS style printf arguments.

avcodec/mlpdec: check that streamtype matches the codec

Fixes use of uninitialized memory
Fixes msan_uninit-mem_7f126c8ed1ac_5945_issue1731_nonpublic.mpg
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/wmalosslessdec: completely initialize contains_subframe

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f60c46325d7_6415_luckynight.wma
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avformat/psxstr: zero packet to prevent uninitialized data to leak through to the decoder

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

swscale/x86/rgb2rgb_template: try to fix build failure with avx disabled

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

avcodec/mpeg12dec: Don't create side data when current picture ptr is NULL.

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

configure: (vp9) ensure bitstream compatibility

avoids picking up a library that could produce invalid bitstreams and
fixes build issues with the same.

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

swscale: NEON optimized unscaled rgba to nv12 conversion

Signed-off-by: Yu Xiaolei <dreifachstein@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avformat/id3v2: Check avio_read() return value in read_chapter()

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

avformat/id3v2: factor free code to the end of read_chapter()

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

mpegts: stop analyzing when pmt for all programs have been found

This disables NOHEADER after finding PMT for all programs to
avoid find_stream_info always exhausting probe size for mpegts.

This is very important for live streams since read speed
will be limited. rtsp, udp and any protocol streaming a live
mpegts will have dramatically faster startup time.

Note, lack of codec parameters for streams can still cause
the full probe size to be exhausted.

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

avformat/utils: limit rfps to values larger than fps

This avoids some nonsense values being produced by totally corrupted input

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

vformat/id3v2: check avio_read for short reads in addition to errors

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

examples/decoding_encoding: check av_samples_get_buffer_size() for a negative value

Fix broken != 0 check.

doc/muxers/tee: add example showing second level escaping

doc/muxers/tee: use @ref to reference other sections

lavf/mux: improve feedback in case of no streams in muxer

avformat/oggparsetheora: zero extradata padding area

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f66fa0ac09d_9197_theora_a4_v6_k250_s0.ogg
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/bink: use av_mallocz for data

Fixes use of uninitialized memory
Fixes msan_uninit-mem_7fe8a5fd759d_2838_SPECTRE.BIK
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avformat/id3v2: Check avio_read() return code in id3v2_parse()

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f5a04a9b50d_7087_mp3__mp3__tooSmallFinal.mp3
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

swscale/utils: check chroma width for fast bilinear scaler

Fixes artifacts where fast bilinear was used for downscaling chroma

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

swscale/utils: remove useless ()

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

swscale/utils: factor (d + 1 < 4) out

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

avcodec/msmpeg4dec: initialize dir_ptr in error cases

Fixes use of uinitialized memory
Fixes: msan_uninit-mem_7f01b8799186_7278_msnaudio.asf
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/msmpeg4dec: print error in case of invalid vlc in msmpeg4_decode_dc for version <=2

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

fate: update after 5f6c21117f23a3c825777cdb0565a21c5a468d35

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

ffprobe: show best_effort_timestamp in the frame section

This is useful for debugging.

Reference and ffprobe.xsd changes done and tested by Stefano Sabatini.

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