ffmpeg.git
5 years agodoc/doxy: remove unused files
Michael Niedermayer [Fri, 27 Dec 2013 12:24:48 +0000 (13:24 +0100)]
doc/doxy: remove unused files

Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 2 Jan 2014 00:53:31 +0000 (01:53 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  Makefile: add html template files to the doxygen deps

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc/muxers/segment: clarify ambiguos reference
Stefano Sabatini [Wed, 1 Jan 2014 23:33:01 +0000 (00:33 +0100)]
doc/muxers/segment: clarify ambiguos reference

Replace "The segmenter muxer" with "This muxer". The "segmenter muxer"
was never defined before, and thus it is a slightly ambiguous term.

5 years agodoc/muxers/segment: reference hls muxer
Stefano Sabatini [Wed, 1 Jan 2014 23:31:49 +0000 (00:31 +0100)]
doc/muxers/segment: reference hls muxer

5 years agodoc/muxers/hls: extend documentation
Stefano Sabatini [Wed, 1 Jan 2014 23:30:37 +0000 (00:30 +0100)]
doc/muxers/hls: extend documentation

In particular, reference segment muxer and clarify difference between
segment filename number and playlist sequence number.

Should fix trac ticket #2601.

5 years agoavformat/mux: fix "no tag found" check in validate_codec_tag()
Michael Niedermayer [Wed, 1 Jan 2014 21:29:06 +0000 (22:29 +0100)]
avformat/mux: fix "no tag found" check in validate_codec_tag()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/vqf: check avio_read()s return value more completely
Michael Niedermayer [Wed, 1 Jan 2014 14:29:20 +0000 (15:29 +0100)]
avformat/vqf: check avio_read()s return value more completely

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f180a523a71_5052_esvorbei_extd.vqf
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/vqavideo: use av_mallocz() for decode_buffer()
Michael Niedermayer [Wed, 1 Jan 2014 14:29:20 +0000 (15:29 +0100)]
avcodec/vqavideo: use av_mallocz() for decode_buffer()

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f62eaba897d_595_4D6EFA92.VQA
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMakefile: add html template files to the doxygen deps
Anton Khirnov [Mon, 16 Dec 2013 08:30:17 +0000 (09:30 +0100)]
Makefile: add html template files to the doxygen deps

5 years agoconfigure: bump year number 2013 -> 2014
Stefano Sabatini [Wed, 1 Jan 2014 12:04:07 +0000 (13:04 +0100)]
configure: bump year number 2013 -> 2014

Happy new year!

5 years agodoc/protocols/rtsp, lavf/rtsp: fix/extend options documentation
Stefano Sabatini [Sun, 29 Dec 2013 15:43:48 +0000 (16:43 +0100)]
doc/protocols/rtsp, lavf/rtsp: fix/extend options documentation

5 years agoffplay: add documentation for "s" key
Werner Robitza [Sun, 29 Dec 2013 17:42:56 +0000 (18:42 +0100)]
ffplay: add documentation for "s" key

With various edits suggested by Stefano Sabatini and Clément Bœsch.

5 years agoavcodec/binkaudio: clear padding area of packet_buffer
Michael Niedermayer [Wed, 1 Jan 2014 02:30:16 +0000 (03:30 +0100)]
avcodec/binkaudio: clear padding area of packet_buffer

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f0dba198b34_2970_Snd0a3a2ad4.dee
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodxva2_vc1: signal skipped p frames
Hendrik Leppkes [Thu, 12 Dec 2013 20:12:53 +0000 (21:12 +0100)]
dxva2_vc1: signal skipped p frames

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodxva2_vc1: fix signaling of intensity compensation values
Hendrik Leppkes [Thu, 12 Dec 2013 20:12:52 +0000 (21:12 +0100)]
dxva2_vc1: fix signaling of intensity compensation values

lumscale/lumshift don't get reset back to their default values if
intensity compensation is not active, and a wrong signaling here can
cause playback issues.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agovc1: set chromaformat = 1 for simple/main profile
Hendrik Leppkes [Thu, 12 Dec 2013 20:12:51 +0000 (21:12 +0100)]
vc1: set chromaformat = 1 for simple/main profile

1 is the only valid value for VC-1/WMV3, and setting it here makes sure
no invalid value is send to a hw accelerator, for example.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodxva2_vc1: set PQUANT as described by the 2010 spec update
Hendrik Leppkes [Thu, 12 Dec 2013 20:12:50 +0000 (21:12 +0100)]
dxva2_vc1: set PQUANT as described by the 2010 spec update

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodxva2_vc1: set bfraction in slice info according to spec
Hendrik Leppkes [Thu, 12 Dec 2013 20:12:49 +0000 (21:12 +0100)]
dxva2_vc1: set bfraction in slice info according to spec

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodxva2_vc1: set refdist value according to spec
Hendrik Leppkes [Thu, 12 Dec 2013 20:12:48 +0000 (21:12 +0100)]
dxva2_vc1: set refdist value according to spec

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mpegvideo_enc: implement frame skip score normalization
Michael Niedermayer [Fri, 20 Dec 2013 13:09:58 +0000 (14:09 +0100)]
avcodec/mpegvideo_enc: implement frame skip score normalization

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/hevc: clear HEVClc when its deallocated in hevc_decode_free()
Michael Niedermayer [Tue, 31 Dec 2013 14:18:47 +0000 (15:18 +0100)]
avcodec/hevc: clear HEVClc when its deallocated in hevc_decode_free()

Fixes reading freed memory
Fixes: asan_heap-uaf_1abf8ef_3987_NUT_A_ericsson_4.bit
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/version: bump micro for addition of internal field to AVStream
Michael Niedermayer [Tue, 31 Dec 2013 13:16:27 +0000 (14:16 +0100)]
avformat/version: bump micro for addition of internal field to AVStream

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat: dont run update_initial_duration() twice
Michael Niedermayer [Tue, 31 Dec 2013 07:36:14 +0000 (08:36 +0100)]
avformat: dont run update_initial_duration() twice

This should avoid floods of first_dts not matching debug messages

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoAvoid using empty macro arguments.
Reimar Döffinger [Mon, 30 Dec 2013 11:10:35 +0000 (12:10 +0100)]
Avoid using empty macro arguments.

These are not supported by all compilers (gcc 2.95 but also older SPARC
compilers, see gcc bug #33304 for example), and there is no real need for them.
One use of this feature remains in libavdevice/v4l2.c which can't be
replaced quite as easily.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
5 years agoavformat/id3v2: allow ID3 parsing without AVFormatContext
Anssi Hannula [Mon, 30 Dec 2013 08:02:59 +0000 (10:02 +0200)]
avformat/id3v2: allow ID3 parsing without AVFormatContext

Add ff_id3v2_read_dict() for parsing without AVFormatContext, but
instead with AVIOContext and AVDictionary.

AVFormatContext is still used for logging, if available.

Chapter parsing is the only non-logging functionality that actually
needs AVFormatContext, and AFAICS it should be modified to write the
data to ID3v2ExtraMeta first, from where it can be implanted to
AVFormatContext by a separate function (like it is done with
read_apic() and ff_id3v2_parse_apic()). That is outside the scope of
this patch, though.

Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
5 years agoavformat/http: allow the caller to select a request range
Anssi Hannula [Sat, 28 Dec 2013 07:41:24 +0000 (09:41 +0200)]
avformat/http: allow the caller to select a request range

Add AVOptions for setting the initial offset and the ending offset, so
they can be used for setting an appropriate Range header.

Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
5 years agoavformat/id3v2: parse ID3 Private frames as extra metadata
Anssi Hannula [Mon, 30 Dec 2013 08:09:17 +0000 (10:09 +0200)]
avformat/id3v2: parse ID3 Private frames as extra metadata

They are used in HLS.

Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
5 years agoavformat/mpegts: demux timed ID3 metadata
Anssi Hannula [Mon, 30 Dec 2013 07:50:46 +0000 (09:50 +0200)]
avformat/mpegts: demux timed ID3 metadata

Used in some HLS streams ("Timed Metadata for HTTP Live Streaming").

This is just ID3 tags at arbitrary stream positions, but I still added
"timed" to the codec name to avoid confusion with regular non-stream ID3
tags.

Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
5 years agoavcodec/lagarith: check and propagate return value from init_get_bits8()
Michael Niedermayer [Mon, 30 Dec 2013 13:27:04 +0000 (14:27 +0100)]
avcodec/lagarith: check and propagate return value from init_get_bits8()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/lagarith: use init_get_bits8()
Michael Niedermayer [Mon, 30 Dec 2013 12:49:49 +0000 (13:49 +0100)]
avcodec/lagarith: use init_get_bits8()

Suggested-by: Reimar
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/lagarith: reenable buggy lag_decode_zero_run_line()
Michael Niedermayer [Mon, 30 Dec 2013 12:47:34 +0000 (13:47 +0100)]
avcodec/lagarith: reenable buggy lag_decode_zero_run_line()

This is to prevent regressions in case the old code was able to partly
decode frames (no way to say without a testcase)
Add a memset to prevent use of uninitialized memory until we have a
testcase and can test/fix it

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'cigaes/master'
Michael Niedermayer [Mon, 30 Dec 2013 12:29:47 +0000 (13:29 +0100)]
Merge remote-tracking branch 'cigaes/master'

* cigaes/master:
  lavc/mjpegenc: use proper error codes.
  lavc/mjpegenc: check av_frame_alloc() failure.
  lavc/libopenjpegenc: check av_frame_alloc() failure.
  lavc/diracdec: check av_frame_alloc() failure.
  lavc/utils: check av_frame_alloc() failure.
  ffprobe: check av_frame_alloc() failure.
  lavc/ffwavesynth: fix dependency sizeof(AVFrame).

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoaf_aresample: remove only use of array compound literals with non-const initializers...
Reimar Döffinger [Sun, 29 Dec 2013 23:52:48 +0000 (00:52 +0100)]
af_aresample: remove only use of array compound literals with non-const initializers in FFmpeg.

Some older compilers might have particular trouble with them,
and they do not really seem worth it to me.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
5 years agoconfigure: check that pthreads is compatible with compiler.
Reimar Döffinger [Sun, 29 Dec 2013 23:47:12 +0000 (00:47 +0100)]
configure: check that pthreads is compatible with compiler.

In particular the mutex initialization for example won't actually
compile with e.g. gcc 2.95.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
5 years agocompat: provide va_copy for old gcc versions.
Reimar Döffinger [Mon, 30 Dec 2013 11:14:06 +0000 (12:14 +0100)]
compat: provide va_copy for old gcc versions.

Since we have this compat/va_copy.h header already we might just as well make
use of it for more than one compiler.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 30 Dec 2013 10:23:32 +0000 (11:23 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavu: Move preprocessor macros in a separate file

Conflicts:
libavutil/avutil.h
libavutil/utils.c
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavc/mjpegenc: use proper error codes.
Nicolas George [Sun, 29 Dec 2013 09:54:32 +0000 (10:54 +0100)]
lavc/mjpegenc: use proper error codes.

5 years agolavc/mjpegenc: check av_frame_alloc() failure.
Nicolas George [Sun, 29 Dec 2013 09:52:19 +0000 (10:52 +0100)]
lavc/mjpegenc: check av_frame_alloc() failure.

5 years agolavc/libopenjpegenc: check av_frame_alloc() failure.
Nicolas George [Sun, 29 Dec 2013 09:50:24 +0000 (10:50 +0100)]
lavc/libopenjpegenc: check av_frame_alloc() failure.

5 years agolavc/diracdec: check av_frame_alloc() failure.
Nicolas George [Sun, 29 Dec 2013 09:49:01 +0000 (10:49 +0100)]
lavc/diracdec: check av_frame_alloc() failure.

5 years agolavc/utils: check av_frame_alloc() failure.
Nicolas George [Sun, 29 Dec 2013 09:42:54 +0000 (10:42 +0100)]
lavc/utils: check av_frame_alloc() failure.

5 years agoffprobe: check av_frame_alloc() failure.
Nicolas George [Sun, 29 Dec 2013 09:37:58 +0000 (10:37 +0100)]
ffprobe: check av_frame_alloc() failure.

5 years agolavc/ffwavesynth: fix dependency sizeof(AVFrame).
Nicolas George [Sun, 29 Dec 2013 09:33:27 +0000 (10:33 +0100)]
lavc/ffwavesynth: fix dependency sizeof(AVFrame).

5 years agooggdec: add support for VP8 demuxing
James Almer [Wed, 25 Dec 2013 05:48:34 +0000 (02:48 -0300)]
oggdec: add support for VP8 demuxing

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Mon, 30 Dec 2013 01:12:49 +0000 (02:12 +0100)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Fix condition for transparency warning in xsub encoder.
  Allow hiding the banner.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/lagarith: fix init_get_bits() size in lag_decode_arith_plane()
Michael Niedermayer [Sun, 29 Dec 2013 22:38:20 +0000 (23:38 +0100)]
avcodec/lagarith: fix init_get_bits() size in lag_decode_arith_plane()

untested due to lack of sample

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/lagarith: fix src/src_size for esc_count < 8
Michael Niedermayer [Sun, 29 Dec 2013 22:38:20 +0000 (23:38 +0100)]
avcodec/lagarith: fix src/src_size for esc_count < 8

untested due to lack of sample

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/lagarith: disable lag_decode_zero_run_line() and ask for a sample
Michael Niedermayer [Sun, 29 Dec 2013 21:58:38 +0000 (22:58 +0100)]
avcodec/lagarith: disable lag_decode_zero_run_line() and ask for a sample

The code seems to have never been tested
fixing it should be quite easy but needs a sample/testcase

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f9a862dfabf_413_2889_assassin_OL.avi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoFix condition for transparency warning in xsub encoder.
Carl Eugen Hoyos [Sun, 29 Dec 2013 22:18:10 +0000 (23:18 +0100)]
Fix condition for transparency warning in xsub encoder.

5 years agoAllow hiding the banner.
Carl Eugen Hoyos [Sat, 28 Dec 2013 04:18:39 +0000 (05:18 +0100)]
Allow hiding the banner.

Fixes ticket #3246.

5 years agolavu: Move preprocessor macros in a separate file
Luca Barbato [Fri, 27 Dec 2013 01:57:48 +0000 (02:57 +0100)]
lavu: Move preprocessor macros in a separate file

And remove all the circular inclusions of avutil.h while at it.

5 years agoMerge remote-tracking branch 'cigaes/master'
Michael Niedermayer [Sun, 29 Dec 2013 20:11:25 +0000 (21:11 +0100)]
Merge remote-tracking branch 'cigaes/master'

* cigaes/master:
  lavd/xv: report if no adaptor present.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'lukaszmluki/master'
Michael Niedermayer [Sun, 29 Dec 2013 20:10:59 +0000 (21:10 +0100)]
Merge remote-tracking branch 'lukaszmluki/master'

* lukaszmluki/master:
  lavf/libssh: improve authentication
  lavf/libssh: fix file mode

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavd/xv: report if no adaptor present.
Nicolas George [Sun, 29 Dec 2013 10:29:18 +0000 (11:29 +0100)]
lavd/xv: report if no adaptor present.

5 years agoMerge remote-tracking branch 'cus/stable'
Michael Niedermayer [Sun, 29 Dec 2013 15:32:43 +0000 (16:32 +0100)]
Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: do not wait for the picture allocation to finish on exit
  ffplay: remove two unneeded av_free_packet calls
  ffplay: remove some unneded av_frame_unref calls
  ffplay: remove unneeded avcodec_get_frame_defaults
  ffplay: use precalculated frame size and bytes per sec values
  ffplay: precalculate audio output frame size and byte per sec

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavf/libssh: improve authentication
Lukasz Marek [Sat, 28 Dec 2013 18:34:29 +0000 (19:34 +0100)]
lavf/libssh: improve authentication

- Add authentication using keys
- Provide better message on fail

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
5 years agolavf/libssh: fix file mode
Lukasz Marek [Sat, 28 Dec 2013 18:33:21 +0000 (19:33 +0100)]
lavf/libssh: fix file mode

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
5 years agoavformat/wc3movie: Check strings before printing.
Michael Niedermayer [Sat, 21 Dec 2013 11:52:23 +0000 (12:52 +0100)]
avformat/wc3movie: Check strings before printing.

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f7812ca062f_2812_SC_32_part.MVE
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/siff: check avio_read() return value before returning packet
Michael Niedermayer [Sun, 29 Dec 2013 12:20:03 +0000 (13:20 +0100)]
avformat/siff: check avio_read() return value before returning packet

Fixes: /ld/michael/ffmpeg_uninit/ffmpeg_uninit/done/msan_uninit-mem_7fb3e0fa86e9_1980_INTRO_B.VB
Fixes use of uninitialized memory
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffplay: do not wait for the picture allocation to finish on exit
Marton Balint [Sun, 29 Dec 2013 02:52:09 +0000 (03:52 +0100)]
ffplay: do not wait for the picture allocation to finish on exit

When SDL could not allocate a YUV overlay or open a window, the video thread
got locked up because it waited for the allocation to finish forever.

Reported-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
Signed-off-by: Marton Balint <cus@passwd.hu>
5 years agoffplay: remove two unneeded av_free_packet calls
Marton Balint [Wed, 25 Dec 2013 15:16:23 +0000 (16:16 +0100)]
ffplay: remove two unneeded av_free_packet calls

Signed-off-by: Marton Balint <cus@passwd.hu>
5 years agoffplay: remove some unneded av_frame_unref calls
Marton Balint [Wed, 25 Dec 2013 14:55:30 +0000 (15:55 +0100)]
ffplay: remove some unneded av_frame_unref calls

av_buffersrc_add_frame implicitly unreferences the added frame.

Signed-off-by: Marton Balint <cus@passwd.hu>
5 years agoffplay: remove unneeded avcodec_get_frame_defaults
Marton Balint [Wed, 25 Dec 2013 14:50:48 +0000 (15:50 +0100)]
ffplay: remove unneeded avcodec_get_frame_defaults

Signed-off-by: Marton Balint <cus@passwd.hu>
5 years agoffplay: use precalculated frame size and bytes per sec values
Marton Balint [Sun, 15 Dec 2013 19:00:45 +0000 (20:00 +0100)]
ffplay: use precalculated frame size and bytes per sec values

Signed-off-by: Marton Balint <cus@passwd.hu>
5 years agoffplay: precalculate audio output frame size and byte per sec
Marton Balint [Sun, 15 Dec 2013 18:51:32 +0000 (19:51 +0100)]
ffplay: precalculate audio output frame size and byte per sec

Signed-off-by: Marton Balint <cus@passwd.hu>
5 years agodoc/encoders: add wavpackenc doc
Timothy Gu [Wed, 18 Dec 2013 05:12:08 +0000 (21:12 -0800)]
doc/encoders: add wavpackenc doc

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
5 years agodoc/encoders: reformat libwavpack documentation
Timothy Gu [Wed, 18 Dec 2013 05:11:06 +0000 (21:11 -0800)]
doc/encoders: reformat libwavpack documentation

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
5 years agoconfigure: remove git url check
Lukasz Marek [Mon, 9 Dec 2013 00:40:03 +0000 (01:40 +0100)]
configure: remove git url check

This part of the script doesn't check if git command is available and produce error if not.
It is 2 years since address changed and it is more reasonable to remove it than fix it.

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/alsdec: skip cases where the master channel equals the current channel
Michael Niedermayer [Sat, 28 Dec 2013 22:53:24 +0000 (23:53 +0100)]
avcodec/alsdec: skip cases where the master channel equals the current channel

Fixes: msan_uninit-mem_7f6c73c97cf9_3571_als_04_2ch48k16b.mp4
Fixes use of uninitialized memory
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Reviewed-by: Thilo Borgmann <thilo.borgmann@mail.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 29 Dec 2013 10:08:13 +0000 (11:08 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  h264: namespace the decode function

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/vda_h264_dec: avoid declaring int in for arguments
Michael Niedermayer [Sun, 29 Dec 2013 02:10:08 +0000 (03:10 +0100)]
avcodec/vda_h264_dec: avoid declaring int in for arguments

Some compilers dont support that

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge branch 'master' of https://github.com/upsuper/ffmpeg-vdadec
Michael Niedermayer [Sun, 29 Dec 2013 02:00:38 +0000 (03:00 +0100)]
Merge branch 'master' of https://github.com/upsuper/ffmpeg-vdadec

* 'master' of https://github.com/upsuper/ffmpeg-vdadec:
  avcodec/vda_h264_dec: add format check

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoomadec: Disable "Unsupported codec ATRAC3+" warning
Maxim Poliakovski [Thu, 10 Oct 2013 18:46:00 +0000 (20:46 +0200)]
omadec: Disable "Unsupported codec ATRAC3+" warning

Also add a list of supported decoders.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoATRAC+ decoder
Maxim Poliakovski [Thu, 10 Oct 2013 18:32:14 +0000 (20:32 +0200)]
ATRAC+ decoder

Cleanup by Diego Biurrun.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/iff: check avio_read() return in get_metadata()
Michael Niedermayer [Sat, 28 Dec 2013 23:57:15 +0000 (00:57 +0100)]
avformat/iff: check avio_read() return in get_metadata()

Fixes: msan_uninit-mem_7f9539ba8461_4760_dasboot_in_compressed
Fixes use of uninitialized memory
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/jpeg2000dec: zero Jpeg2000QuantStyle structure before use in get_qcd()
Michael Niedermayer [Sat, 28 Dec 2013 20:47:27 +0000 (21:47 +0100)]
avcodec/jpeg2000dec: zero Jpeg2000QuantStyle structure before use in get_qcd()

Fixes: msan_uninit-mem_7f50b84aac30_6823_mjp2.mov
Fixes use of uninitialized memory
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil/frame: increase padding for frames
Michael Niedermayer [Sat, 28 Dec 2013 18:05:39 +0000 (19:05 +0100)]
avutil/frame: increase padding for frames

This matches what avcodec uses

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/h264: remove unused variable
Michael Niedermayer [Sat, 28 Dec 2013 17:19:46 +0000 (18:19 +0100)]
avcodec/h264: remove unused variable

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoswscale/arm: fix build error with --enable-shared
Yu Xiaolei [Sat, 28 Dec 2013 02:08:43 +0000 (10:08 +0800)]
swscale/arm: fix build error with --enable-shared

    use string comparison in assembler derivatives to prevents assembler from treating names in test expressions as imported symbols

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mov: clear padding area in mov_read_extradata()
Michael Niedermayer [Sat, 28 Dec 2013 02:41:29 +0000 (03:41 +0100)]
avformat/mov: clear padding area in mov_read_extradata()

Fixes: msan_uninit-mem_7f58816b71e3_7025_mov_svq3___svq3_weird_prediction2.mov
Fixes use of uninitialized memory
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mov: check avio_read() return in mov_read_dref()
Michael Niedermayer [Fri, 27 Dec 2013 22:35:46 +0000 (23:35 +0100)]
avformat/mov: check avio_read() return in mov_read_dref()

Fixes: msan_uninit-mem_7f4960453a02_7264_mr_cork_jpeg.mov
Fixes use of uninitialized memory
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'rbultje/vp9-simd'
Michael Niedermayer [Fri, 27 Dec 2013 12:57:34 +0000 (13:57 +0100)]
Merge remote-tracking branch 'rbultje/vp9-simd'

* rbultje/vp9-simd:
  vp9/x86: 16px MC functions (64bit only).
  vp9/x86: 16x16 sub-IDCT for top-left 8x8 subblock (eob <= 38).

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 27 Dec 2013 12:08:46 +0000 (13:08 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  doxy: Update the css to have a flat style

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '9ace13db77a22fd59c217175596a95775c5d25aa'
Michael Niedermayer [Fri, 27 Dec 2013 11:25:50 +0000 (12:25 +0100)]
Merge commit '9ace13db77a22fd59c217175596a95775c5d25aa'

* commit '9ace13db77a22fd59c217175596a95775c5d25aa':
  doxy: Fix link in badge color

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc/protocols: fix level of udp examples subsection
Stefano Sabatini [Fri, 27 Dec 2013 11:43:35 +0000 (12:43 +0100)]
doc/protocols: fix level of udp examples subsection

5 years agoMerge commit 'b83d1ee3b41cfe8357836e2582104db2f3364cb0'
Michael Niedermayer [Fri, 27 Dec 2013 11:01:23 +0000 (12:01 +0100)]
Merge commit 'b83d1ee3b41cfe8357836e2582104db2f3364cb0'

* commit 'b83d1ee3b41cfe8357836e2582104db2f3364cb0':
  avutil: Move library version related macros to version.h

Conflicts:
libavcodec/version.h
libavresample/version.h
libavutil/avutil.h
libavutil/utils.c

See: 183117fed7d0a910b5f65e5c78b065f125abf369
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mpegts: check sl.timestamp_len
Michael Niedermayer [Fri, 27 Dec 2013 10:45:55 +0000 (11:45 +0100)]
avformat/mpegts: check sl.timestamp_len

Fixes: msan_uninit-mem_7ff4404547ba_4883_dmbts.ts
Fixes assertion failure
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoh264: namespace the decode function
Luca Barbato [Fri, 27 Dec 2013 06:48:13 +0000 (07:48 +0100)]
h264: namespace the decode function

Make much easier debugging.

5 years agovp9/x86: 16px MC functions (64bit only).
Ronald S. Bultje [Tue, 24 Dec 2013 21:17:03 +0000 (16:17 -0500)]
vp9/x86: 16px MC functions (64bit only).

Cycle counts for large MCs (old -> new on ped1080p.webm, mx!=0&&my!=0):
16x8:    876 ->   870  (0.7%)
16x16:  1444 ->  1435  (0.7%)
16x32:  2784 ->  2748  (1.3%)
32x16:  2455 ->  2349  (4.5%)
32x32:  4641 ->  4084 (13.6%)
32x64:  9200 ->  7834 (17.4%)
64x32:  8980 ->  7197 (24.8%)
64x64: 17330 -> 13796 (25.6%)
Total decoding time goes from 9.326sec to 9.182sec.

5 years agoavcodec/pcm-dvd: reset last header on errors
Michael Niedermayer [Fri, 27 Dec 2013 02:00:13 +0000 (03:00 +0100)]
avcodec/pcm-dvd: reset last header on errors

Fixes: msan_uninit-mem_7f4fff975a2c_4957_dvd_audio_sample.aob
Fixes use of uninitialized memory
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoxy: Update the css to have a flat style
Luca Barbato [Mon, 16 Dec 2013 00:18:56 +0000 (01:18 +0100)]
doxy: Update the css to have a flat style

Drop references to the doxy image gradients and style a the code blocks to
keep the whitespace and indent properly.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agodoxy: Fix link in badge color
Luca Barbato [Mon, 16 Dec 2013 00:24:15 +0000 (01:24 +0100)]
doxy: Fix link in badge color

Green on blue was not exactly optimal.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agoavcodec/huffyuvdec: clear remainder of the array on end of input in decode_422_bitstr...
Michael Niedermayer [Thu, 26 Dec 2013 23:23:10 +0000 (00:23 +0100)]
avcodec/huffyuvdec: clear remainder of the array on end of input in decode_422_bitstream()

Fixes: msan_uninit-mem_7f909423efcd_9923_yuv_predmed.avi
Fixes use of uninitialized memory
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil: Move library version related macros to version.h
Diego Biurrun [Wed, 25 Dec 2013 16:16:05 +0000 (17:16 +0100)]
avutil: Move library version related macros to version.h

This is a more sensible place for these macros.

5 years agoavformat/oggparseogm: check input size before reading t
Michael Niedermayer [Mon, 23 Dec 2013 17:09:58 +0000 (18:09 +0100)]
avformat/oggparseogm: check input size before reading t

Makes no difference in outcome, as the checks on t have no effect
when t was uninitialized

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7fa2b7b5d97c_3598_anOTHERS_DixX_in_Ogg_Sample.avi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/oggparseogm: check input size before reading parameters
Michael Niedermayer [Mon, 23 Dec 2013 17:09:58 +0000 (18:09 +0100)]
avformat/oggparseogm: check input size before reading parameters

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f4d0daad100_3599_anOTHERS_DixX_in_Ogg_Sample.avi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/ivi_common: use av_mallocz() to allocate mbs array
Michael Niedermayer [Mon, 23 Dec 2013 17:09:58 +0000 (18:09 +0100)]
avcodec/ivi_common: use av_mallocz() to allocate mbs array

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f1dffa1c016_8245_sasha.avi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/vda_h264_dec: add format check
Xidorn Quan [Thu, 26 Dec 2013 13:05:36 +0000 (00:05 +1100)]
avcodec/vda_h264_dec: add format check

Fix crash when using this decoder for unsupported format on some version
of OS X.

5 years agoavcodec/wnv1: clear padding area of rbuf
Michael Niedermayer [Mon, 23 Dec 2013 17:09:58 +0000 (18:09 +0100)]
avcodec/wnv1: clear padding area of rbuf

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7faa48586020_2145_MAILTEST.AVI
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/avectorscope: fix {} mistake in alloc check.
Clément Bœsch [Thu, 26 Dec 2013 12:48:30 +0000 (13:48 +0100)]
avfilter/avectorscope: fix {} mistake in alloc check.