ffmpeg.git
6 years agolavu/opt: apply range checks also when setting format string value
Stefano Sabatini [Mon, 16 Dec 2013 14:02:56 +0000 (15:02 +0100)]
lavu/opt: apply range checks also when setting format string value

Previously when setting a pixel/sample format as a string range checks
were not performed. This is consistent with the
av_opt_set_pixel/sample_fmt() interface.

6 years agolavu/opt: factorize setting of format values from string
Stefano Sabatini [Mon, 16 Dec 2013 13:55:54 +0000 (14:55 +0100)]
lavu/opt: factorize setting of format values from string

Simplify incoming patch.

6 years agolavu/opt: fix range check logic in set_format()
Stefano Sabatini [Mon, 16 Dec 2013 13:17:50 +0000 (14:17 +0100)]
lavu/opt: fix range check logic in set_format()

In particular, allow to reject undefined values. Previously the code
was only accepting values in the range -1 .. NB_FORMATS-1.

6 years agoavformat/rmdec: move packet allocation down
Michael Niedermayer [Mon, 23 Dec 2013 17:09:58 +0000 (18:09 +0100)]
avformat/rmdec: move packet allocation down

Fixes memleak
Fixes: msan_uninit-mem_7fc5d73327d4_6192_kuerti.ra
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/rmdec: check against mismatching int4 interleaver parameters which would...
Michael Niedermayer [Mon, 23 Dec 2013 17:09:58 +0000 (18:09 +0100)]
avformat/rmdec: check against mismatching int4 interleaver parameters which would leave uninitialized holes

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f9cf38857c0_4582_coop.ra
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/shorten: clear bitstream buffer
Michael Niedermayer [Mon, 23 Dec 2013 17:09:58 +0000 (18:09 +0100)]
avcodec/shorten: clear bitstream buffer

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f3ca95606fb_6393_luckynight-partial.shn
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 25 Dec 2013 23:12:43 +0000 (00:12 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: Explicitly disable w32threads if the test for it fails

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/mpc8: check avio_read() return in mpc8_parse_seektable()
Michael Niedermayer [Wed, 25 Dec 2013 22:55:06 +0000 (23:55 +0100)]
avformat/mpc8: check avio_read() return in mpc8_parse_seektable()

no sample / testcase known

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/mpc8: clear buffer padding area
Michael Niedermayer [Mon, 23 Dec 2013 17:09:58 +0000 (18:09 +0100)]
avformat/mpc8: clear buffer padding area

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7fa6a48cd1d5_8853_sv8_notags.mpc
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffmpeg_opt: Fix -target vcd
Carl Eugen Hoyos [Wed, 25 Dec 2013 17:34:29 +0000 (18:34 +0100)]
ffmpeg_opt: Fix -target vcd

The removed line makes no sense and doesnt work

fixes ticket #3239

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffprobe: Dont clear AVFrame between uses.
Michael Niedermayer [Wed, 25 Dec 2013 17:32:03 +0000 (18:32 +0100)]
ffprobe: Dont clear AVFrame between uses.

The old API required this clearing in the past, the new API does not
require it.

Fixes memleak
Regression introduced by 37a749012aaacc801fe860428417a6d7b81c103f

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/volume: fix NULL reference in filter_frame()
Stefano Sabatini [Wed, 25 Dec 2013 18:13:23 +0000 (19:13 +0100)]
lavfi/volume: fix NULL reference in filter_frame()

Fix crash.

6 years agodoc/protocols/tcp,lavf/tcp: apply minor fixes to TCP protocol documentation
Stefano Sabatini [Tue, 24 Dec 2013 15:27:34 +0000 (16:27 +0100)]
doc/protocols/tcp,lavf/tcp: apply minor fixes to TCP protocol documentation

6 years agolavf/tcp: honor listen option value in a tag
Stefano Sabatini [Tue, 24 Dec 2013 15:48:45 +0000 (16:48 +0100)]
lavf/tcp: honor listen option value in a tag

Consistent with what is done in udp.c, allow to explicitly disable listen
with listen=0.

6 years agodoc/protocols/udp,lavf/udp: apply minor documentation fixes
Stefano Sabatini [Tue, 24 Dec 2013 13:38:48 +0000 (14:38 +0100)]
doc/protocols/udp,lavf/udp: apply minor documentation fixes

6 years agolavfi/volume: extend volume logging
Stefano Sabatini [Wed, 25 Dec 2013 16:55:16 +0000 (17:55 +0100)]
lavfi/volume: extend volume logging

6 years agolavfi/volume: implement process_command() callback, with the volume command
Stefano Sabatini [Mon, 23 Dec 2013 17:24:57 +0000 (18:24 +0100)]
lavfi/volume: implement process_command() callback, with the volume command

Address trac ticket #2868.

6 years agolavfi/volume: support volume expression and per-frame expression evaluation
Stefano Sabatini [Fri, 22 Feb 2013 23:17:17 +0000 (00:17 +0100)]
lavfi/volume: support volume expression and per-frame expression evaluation

The eval mode allows to evaluate the expression per-frame or just at
init.

In particular, address ticket #3234.

6 years agoavformat/westwood_vqa: use ff_get_extradata()
Michael Niedermayer [Wed, 25 Dec 2013 15:37:42 +0000 (16:37 +0100)]
avformat/westwood_vqa: use ff_get_extradata()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/vc1test: use ff_get_extradata()
Michael Niedermayer [Wed, 25 Dec 2013 15:37:42 +0000 (16:37 +0100)]
avformat/vc1test: use ff_get_extradata()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/rsd: use ff_get_extradata()
Michael Niedermayer [Wed, 25 Dec 2013 15:37:42 +0000 (16:37 +0100)]
avformat/rsd: use ff_get_extradata()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/rmdec: use ff_get_extradata()
Michael Niedermayer [Wed, 25 Dec 2013 15:37:42 +0000 (16:37 +0100)]
avformat/rmdec: use ff_get_extradata()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/rl2: use ff_get_extradata()
Michael Niedermayer [Wed, 25 Dec 2013 15:37:42 +0000 (16:37 +0100)]
avformat/rl2: use ff_get_extradata()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/riffdec: use ff_get_extradata()
Michael Niedermayer [Wed, 25 Dec 2013 15:37:42 +0000 (16:37 +0100)]
avformat/riffdec: use ff_get_extradata()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/nuv: use ff_get_extradata()
Michael Niedermayer [Wed, 25 Dec 2013 15:37:42 +0000 (16:37 +0100)]
avformat/nuv: use ff_get_extradata()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/nutdec: use ff_get_extradata()
Michael Niedermayer [Wed, 25 Dec 2013 15:37:42 +0000 (16:37 +0100)]
avformat/nutdec: use ff_get_extradata()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/mpc8: use ff_get_extradata()
Michael Niedermayer [Wed, 25 Dec 2013 15:37:42 +0000 (16:37 +0100)]
avformat/mpc8: use ff_get_extradata()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/mpc: use ff_get_extradata()
Michael Niedermayer [Wed, 25 Dec 2013 15:37:42 +0000 (16:37 +0100)]
avformat/mpc: use ff_get_extradata()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/mov: use ff_get_extradata()
Michael Niedermayer [Wed, 25 Dec 2013 15:37:42 +0000 (16:37 +0100)]
avformat/mov: use ff_get_extradata()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/isom: use ff_get_extradata()
Michael Niedermayer [Wed, 25 Dec 2013 15:37:42 +0000 (16:37 +0100)]
avformat/isom: use ff_get_extradata()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/idcin: use ff_get_extradata()
Michael Niedermayer [Wed, 25 Dec 2013 15:37:42 +0000 (16:37 +0100)]
avformat/idcin: use ff_get_extradata()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/flvdec: use ff_get_extradata()
Michael Niedermayer [Wed, 25 Dec 2013 15:37:42 +0000 (16:37 +0100)]
avformat/flvdec: use ff_get_extradata()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/ffmdec: use ff_get_extradata()
Michael Niedermayer [Wed, 25 Dec 2013 15:37:42 +0000 (16:37 +0100)]
avformat/ffmdec: use ff_get_extradata()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/cafdec: use ff_get_extradata()
Michael Niedermayer [Wed, 25 Dec 2013 15:37:42 +0000 (16:37 +0100)]
avformat/cafdec: use ff_get_extradata()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/bink: use ff_get_extradata()
Michael Niedermayer [Wed, 25 Dec 2013 15:37:42 +0000 (16:37 +0100)]
avformat/bink: use ff_get_extradata()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/avidec: use ff_get_extradata()
Michael Niedermayer [Wed, 25 Dec 2013 15:37:42 +0000 (16:37 +0100)]
avformat/avidec: use ff_get_extradata()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/apetag: use ff_get_extradata()
Michael Niedermayer [Wed, 25 Dec 2013 15:37:42 +0000 (16:37 +0100)]
avformat/apetag: use ff_get_extradata()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/apc: use ff_get_extradata()
Michael Niedermayer [Wed, 25 Dec 2013 15:37:42 +0000 (16:37 +0100)]
avformat/apc: use ff_get_extradata()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/aiffdec: use ff_get_extradata()
Michael Niedermayer [Wed, 25 Dec 2013 15:37:42 +0000 (16:37 +0100)]
avformat/aiffdec: use ff_get_extradata()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/adxdec: use ff_get_extradata()
Michael Niedermayer [Wed, 25 Dec 2013 15:37:42 +0000 (16:37 +0100)]
avformat/adxdec: use ff_get_extradata()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat: add ff_get_extradata()
Michael Niedermayer [Wed, 25 Dec 2013 15:34:46 +0000 (16:34 +0100)]
avformat: add ff_get_extradata()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/isom: free extradata on failure to read it
Michael Niedermayer [Mon, 23 Dec 2013 17:09:58 +0000 (18:09 +0100)]
avformat/isom: free extradata  on failure to read it

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f607d80f661_6965_mov00003.mqv
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/mov: check avio_read return in mov_read_dvc1()
Michael Niedermayer [Mon, 23 Dec 2013 17:09:58 +0000 (18:09 +0100)]
avformat/mov: check avio_read return in mov_read_dvc1()

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f46d5199ee1_9456_vc1-wmapro.ism
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomatroskadec: Fix bug when parsing realaudio codec parameters
James Almer [Tue, 24 Dec 2013 23:26:32 +0000 (20:26 -0300)]
matroskadec: Fix bug when parsing realaudio codec parameters

flavor can be 0.

This fixes tract ticket #3214

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoconfigure: Explicitly disable w32threads if the test for it fails
Diego Biurrun [Mon, 23 Dec 2013 03:24:52 +0000 (04:24 +0100)]
configure: Explicitly disable w32threads if the test for it fails

This avoids false positive enabling of w32threads if explicitly
requested on the command line, but dependencies are missing.

6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 25 Dec 2013 11:39:16 +0000 (12:39 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  error.h: Do not circularly depend on avutil.h

See: 7c2bb79f3b849d12800856379063f99f3b018678
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/ape: free packet on avio_read() failure
Michael Niedermayer [Mon, 23 Dec 2013 17:09:58 +0000 (18:09 +0100)]
avformat/ape: free packet on avio_read() failure

Fixes memleak
Fixes: msan_uninit-mem_7fcc198b365b_8417_sh3.ape
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/nut: add minor_version field with version>=4
Michael Niedermayer [Mon, 23 Dec 2013 02:25:25 +0000 (03:25 +0100)]
avformat/nut: add minor_version field with version>=4

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/nut: store version in the context
Michael Niedermayer [Mon, 23 Dec 2013 02:25:24 +0000 (03:25 +0100)]
avformat/nut: store version in the context

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/ape: zero seektable&bittable and warn when they where only partially filled
Michael Niedermayer [Mon, 23 Dec 2013 17:09:58 +0000 (18:09 +0100)]
avformat/ape: zero seektable&bittable and warn when they where only partially filled

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7fcc198b365b_8417_sh3.ape
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/vmdav: return the amount of data that has been unpacked from lz_unpack()...
Michael Niedermayer [Mon, 23 Dec 2013 17:09:58 +0000 (18:09 +0100)]
avcodec/vmdav: return the amount of data that has been unpacked from lz_unpack() (as well as errors)

and setup the bytestream buffer size accordingly

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7fdcc513cd45_229_12.vmd
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoerror.h: Do not circularly depend on avutil.h
Diego Biurrun [Fri, 13 Dec 2013 17:50:48 +0000 (18:50 +0100)]
error.h: Do not circularly depend on avutil.h

6 years agoavcodec/eatgv: use av_mallocz() for frame_buffer
Michael Niedermayer [Mon, 23 Dec 2013 17:09:58 +0000 (18:09 +0100)]
avcodec/eatgv: use av_mallocz() for frame_buffer

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7fbf6159587b_2571_ORIGIN.TGV
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoswscale/utils: fix wrong deprecated message with rgb0
Michael Niedermayer [Tue, 24 Dec 2013 21:47:49 +0000 (22:47 +0100)]
swscale/utils: fix wrong deprecated message with rgb0

Fixes Ticket3242
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoAllow stream-copying grayscale mov files.
Carl Eugen Hoyos [Thu, 12 Dec 2013 12:47:44 +0000 (13:47 +0100)]
Allow stream-copying grayscale mov files.

This reverts 0de2157f / r12272.
Fixes ticket #3215.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/mov: Do not compute a grayscale palette for cinepak in mov.
Carl Eugen Hoyos [Thu, 12 Dec 2013 12:42:10 +0000 (13:42 +0100)]
avformat/mov: Do not compute a grayscale palette for cinepak in mov.

This was never done for avi files, the decoder always produced
output no matter if a palette was computed or not.
Since a non-standard palette was needed, this simplifies the code.
See issue 1067 and ticket #165.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/matroskadec: Fix start_time
Alex Sukhanov [Mon, 23 Dec 2013 09:41:35 +0000 (01:41 -0800)]
avformat/matroskadec: Fix start_time

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovp9: fix crash if segmentation=1, keyframe/intraonly=1 and updatemap=0.
Ronald S. Bultje [Tue, 24 Dec 2013 02:40:13 +0000 (21:40 -0500)]
vp9: fix crash if segmentation=1, keyframe/intraonly=1 and updatemap=0.

The reference map is never used in such cases, but we accidently copied
it anyway. This could cause crashes if this map has not yet been
allocated. Fixes trac ticket 3188.

Reviewed-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovp9: fix bug in updating of coef probabilities with parallelmode=1.
Ronald S. Bultje [Tue, 24 Dec 2013 02:41:35 +0000 (21:41 -0500)]
vp9: fix bug in updating of coef probabilities with parallelmode=1.

Fixes trac ticket 3228.

Reviewed-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/libopusdec: Set codec->delay to pre_skip not fixed value
Jan Gerber [Fri, 20 Dec 2013 06:10:41 +0000 (11:40 +0530)]
avcodec/libopusdec: Set codec->delay to pre_skip not fixed value

Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoRead pictures in id3v2.2
Carl Eugen Hoyos [Mon, 23 Dec 2013 22:41:37 +0000 (23:41 +0100)]
Read pictures in id3v2.2

6 years agoavcodec/wavpack fix *void pointer arithmetic
Michael Niedermayer [Mon, 23 Dec 2013 22:06:10 +0000 (23:06 +0100)]
avcodec/wavpack fix *void pointer arithmetic

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agowtvenc: output ff_format_none if ff_put_wav_header fails
Peter Ross [Mon, 23 Dec 2013 09:39:50 +0000 (20:39 +1100)]
wtvenc: output ff_format_none if ff_put_wav_header fails

This occurs when muxing E-AC-3.

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agowtvenc: use codec tag + MEDIASUBTYPE_BASE_GUID, if there is no suitable guid
Peter Ross [Mon, 23 Dec 2013 09:39:31 +0000 (20:39 +1100)]
wtvenc: use codec tag + MEDIASUBTYPE_BASE_GUID, if there is no suitable guid

This permits H264, AAC, AAC-LATM muxing.

Fixes ticket #536.

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agowtv: make ff_format_videoinfo2 visible to wtv encoder
Peter Ross [Mon, 23 Dec 2013 09:39:13 +0000 (20:39 +1100)]
wtv: make ff_format_videoinfo2 visible to wtv encoder

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agotools/zmqsend: rename ctx to zmq_ctx
Stefano Sabatini [Mon, 23 Dec 2013 17:43:55 +0000 (18:43 +0100)]
tools/zmqsend: rename ctx to zmq_ctx

The new name is more explicit.

6 years agotools/zmqsend: use valid NULL log context
Stefano Sabatini [Mon, 23 Dec 2013 17:41:58 +0000 (18:41 +0100)]
tools/zmqsend: use valid NULL log context

The zmq context is not a valid log context. Fix crash.

6 years agoavcodec/apedec: use av_fast_padded_malloc()
Michael Niedermayer [Mon, 23 Dec 2013 17:09:58 +0000 (18:09 +0100)]
avcodec/apedec: use av_fast_padded_malloc()

Fixes use of uninitialized memory
Fixes part of msan_uninit-mem_7fa0d8c8bd58_8417_sh3.ape
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/apedec: more checks for k
Michael Niedermayer [Mon, 23 Dec 2013 17:09:58 +0000 (18:09 +0100)]
avcodec/apedec: more checks for k

Fixes assertion failure
Fixes part of msan_uninit-mem_7fa0d8c8bd58_8417_sh3.ape
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/libopencore-amr: remove av_free coded_frame.
Michael Niedermayer [Mon, 23 Dec 2013 16:38:39 +0000 (17:38 +0100)]
avcodec/libopencore-amr: remove av_free coded_frame.

There seems to be nothing that sets coded_frame
also av_free is wrong

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMAINTAINERS: drop 2.0 from the releases that i maintain
Michael Niedermayer [Mon, 23 Dec 2013 16:24:12 +0000 (17:24 +0100)]
MAINTAINERS: drop 2.0 from the releases that i maintain

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/iss: check sscanf() return code
Michael Niedermayer [Sun, 22 Dec 2013 23:17:52 +0000 (00:17 +0100)]
avformat/iss: check sscanf() return code

Fixes use of uninitialized data
Fixes: msan_uninit-mem_7f883205ce82_15_0001010100.iss
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agowtvenc: populate VIDEOINFOHEADER2
Peter Ross [Mon, 23 Dec 2013 09:37:28 +0000 (20:37 +1100)]
wtvenc: populate VIDEOINFOHEADER2

Fixes ticket #2835.

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/riffenc: indent
Peter Ross [Mon, 23 Dec 2013 09:37:13 +0000 (20:37 +1100)]
avformat/riffenc: indent

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoriffenc: add option to ff_put_bmp_header to ignore extradata
Peter Ross [Mon, 23 Dec 2013 09:37:00 +0000 (20:37 +1100)]
riffenc: add option to ff_put_bmp_header to ignore extradata

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agowtvenc: test avio_size() validity
Peter Ross [Mon, 23 Dec 2013 10:04:45 +0000 (21:04 +1100)]
wtvenc: test avio_size() validity

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 23 Dec 2013 12:04:02 +0000 (13:04 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavu: fix typo in documentation.

See: e53061154f42cda93052a2f558e1c4697e3b0c1a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '57ead8449e44bd07b3d4a5bd42f1aab64566f92e'
Michael Niedermayer [Mon, 23 Dec 2013 11:52:30 +0000 (12:52 +0100)]
Merge commit '57ead8449e44bd07b3d4a5bd42f1aab64566f92e'

* commit '57ead8449e44bd07b3d4a5bd42f1aab64566f92e':
  doc: fix link to the ISC license text in the developer documentation.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '6c0e83511705e7f8f5100e7852a1e7fd16aa8877'
Michael Niedermayer [Mon, 23 Dec 2013 10:58:14 +0000 (11:58 +0100)]
Merge commit '6c0e83511705e7f8f5100e7852a1e7fd16aa8877'

* commit '6c0e83511705e7f8f5100e7852a1e7fd16aa8877':
  doc: fix a coding style error in the developer documentation.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/utils: fix memleak on avcodec_open2() failure
Michael Niedermayer [Mon, 23 Dec 2013 00:53:05 +0000 (01:53 +0100)]
avcodec/utils: fix memleak on avcodec_open2() failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/wavpack: clear remainder of data in case of error in wv_unpack_mono/stereo()
Michael Niedermayer [Sun, 22 Dec 2013 23:17:52 +0000 (00:17 +0100)]
avcodec/wavpack: clear remainder of data in case of error in wv_unpack_mono/stereo()

Fixes use of uninitialized data
Fixes: msan_uninit-mem_7fd85b654950_4005_because.wv
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavu: fix typo in documentation.
Tim Walker [Tue, 17 Dec 2013 15:47:31 +0000 (15:47 +0000)]
lavu: fix typo in documentation.

6 years agodoc: fix link to the ISC license text in the developer documentation.
Tim Walker [Sun, 22 Dec 2013 16:52:05 +0000 (16:52 +0000)]
doc: fix link to the ISC license text in the developer documentation.

6 years agodoc: fix a coding style error in the developer documentation.
Tim Walker [Sun, 22 Dec 2013 17:07:35 +0000 (17:07 +0000)]
doc: fix a coding style error in the developer documentation.

6 years agoavutil/avstring: add av_strnlen()
Michael Niedermayer [Sat, 21 Dec 2013 14:42:04 +0000 (15:42 +0100)]
avutil/avstring: add av_strnlen()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoConvert XvMC to hwaccel v3
Ivan Kalvachev [Sat, 14 Dec 2013 19:29:15 +0000 (21:29 +0200)]
Convert XvMC to hwaccel v3

Signed-off-by: Ivan Kalvachev <ikalvachev@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 22 Dec 2013 20:39:10 +0000 (21:39 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  vc1: Fix intensity compensation performance regression

Conflicts:
libavcodec/vc1.c

See: ed5bed4152203aed8cce01a679bed67bbda8903f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoconfigure: support raising major version in soname
Michael Niedermayer [Wed, 18 Dec 2013 04:20:11 +0000 (05:20 +0100)]
configure: support raising major version in soname

this allows seperate installation of shared libs that should not conflict with
whatever is already installed.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffmpeg: use timestamp from before and after the decoder to detect backward moving...
Michael Niedermayer [Sun, 22 Dec 2013 18:42:13 +0000 (19:42 +0100)]
ffmpeg: use timestamp from before and after the decoder to detect backward moving dts for discontinuity detection

This should make discontinuity detection more robust and detect
more cases. Timestamps after the decoder can be delayed due to threads,
timestamps before can be missing

no testcase available/known

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agonutenc/write_index: warn if 2 consecutive keyframes have the same PTS and discard...
Michael Niedermayer [Sun, 22 Dec 2013 17:47:28 +0000 (18:47 +0100)]
nutenc/write_index: warn if 2 consecutive keyframes have the same PTS and discard the 2nd

This fixes an assertion failure and regression and restores previous behaviour
Fixes Ticket3197

An alternative would be to fail hard in this case and refuse to mux such data.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovc1: Fix intensity compensation performance regression
Mason Carter [Sun, 22 Dec 2013 01:27:18 +0000 (17:27 -0800)]
vc1: Fix intensity compensation performance regression

Introduced by 28243b0d35b47bbf9abbd454fc444a6e0a9e7b71

Intensity compensation is always used once it was encountered, because
v->next_use_ic is never set back to zero.

Reset v->next_use_ic, when resetting v->next_luty/uv.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agovc1: simplify *_use_ic initialization
Michael Niedermayer [Sun, 22 Dec 2013 13:37:30 +0000 (14:37 +0100)]
vc1: simplify *_use_ic initialization

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoVC1: Fix intensity compensation performance regression
Mason Carter [Sun, 22 Dec 2013 01:27:18 +0000 (17:27 -0800)]
VC1: Fix intensity compensation performance regression

Fix https://trac.ffmpeg.org/ticket/3204

The problem was that intensity compensation was always used once it was
encountered. This is because v->next_use_ic was never set back to zero.
To fix this, when resetting v->next_luty/uv, also reset v->next_use_ic.

This improved (restored) performance by 85% when decoding
http://bit.ly/bbbwmv

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 22 Dec 2013 11:43:43 +0000 (12:43 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  hevc: move DSP declarations from hevc.h into hevcdsp.h

Conflicts:
libavcodec/hevc.h
libavcodec/hevcdsp.c
libavcodec/hevcdsp.h

See: c8dd048ab8cff815c9f4b16a62db0b74df011f0a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'be7c323176e2e5fcf30e3d2ff20975b2f936811b'
Michael Niedermayer [Sun, 22 Dec 2013 10:53:41 +0000 (11:53 +0100)]
Merge commit 'be7c323176e2e5fcf30e3d2ff20975b2f936811b'

* commit 'be7c323176e2e5fcf30e3d2ff20975b2f936811b':
  Add a libwebp encoder

Conflicts:
Changelog
doc/encoders.texi
doc/general.texi
libavcodec/version.h
libavformat/img2enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agohevc: move DSP declarations from hevc.h into hevcdsp.h
Guillaume Martres [Fri, 20 Dec 2013 23:08:50 +0000 (00:08 +0100)]
hevc: move DSP declarations from hevc.h into hevcdsp.h

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agoavformat/4xm: shrink packet if it was only partially initialized
Michael Niedermayer [Sat, 21 Dec 2013 11:52:23 +0000 (12:52 +0100)]
avformat/4xm: shrink packet if it was only partially initialized

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f6c76ab7950_4920_dracula.4xm
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/isom: check avio_read() result
Michael Niedermayer [Sat, 21 Dec 2013 11:52:23 +0000 (12:52 +0100)]
avformat/isom: check avio_read() result

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f7aa4151661_4885_dmbts3.ts
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/rmdec: zero string destination before use
Michael Niedermayer [Sat, 21 Dec 2013 11:52:23 +0000 (12:52 +0100)]
avformat/rmdec: zero string destination before use

Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f9677850d99_4635_crashed.rm
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoAdd a libwebp encoder
Justin Ruggles [Fri, 22 Nov 2013 16:05:13 +0000 (11:05 -0500)]
Add a libwebp encoder