OSDN Git Service
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
Stefano Sabatini [Fri, 27 Dec 2013 11:43:35 +0000 (12:43 +0100)]
doc/protocols: fix level of udp examples subsection
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>
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>
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.
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>
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>
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>
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>
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.
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>
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>
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>
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.
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>
Clément Bœsch [Thu, 26 Dec 2013 12:48:30 +0000 (13:48 +0100)]
avfilter/avectorscope: fix {} mistake in alloc check.
Ronald S. Bultje [Sat, 14 Dec 2013 19:40:35 +0000 (14:40 -0500)]
vp9/x86: 16x16 sub-IDCT for top-left 8x8 subblock (eob <= 38).
Sub8x8 speed (w/o dc-only case) goes from ~750 cycles (inter) or ~735
cycles (intra) to ~415 cycles (inter) or ~430 cycles (intra). Average
overall 16x16 idct speed goes from ~635 cycles (inter) or ~720 cycles
(intra) to ~415 cycles (inter) or ~545 (intra) - all measurements done
using ped1080p.webm.
Michael Niedermayer [Thu, 26 Dec 2013 12:24:10 +0000 (13:24 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mms: Remove non-utf8 characters
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Stefano Sabatini [Mon, 16 Dec 2013 15:37:37 +0000 (16:37 +0100)]
lavfi/abuffersrc: use AV_OPT_TYPE_SAMPLE_FMT for sample_fmt option
Simplify/extend syntax.
Stefano Sabatini [Mon, 16 Dec 2013 15:29:44 +0000 (16:29 +0100)]
lavu,lavc,lswr: do not hardcode AV_SAMPLE_FMT_NB value when setting sample format max value
The constant may change in libavutil but the library may be compiled
against an older version, thus rejecting a value which is otherwise
supported by the new libavutil.
INT_MAX is used here to denote the max allowed value for a sample format.
The opt-test code is changed to provide a valid reference example.
Stefano Sabatini [Mon, 16 Dec 2013 15:11:49 +0000 (16:11 +0100)]
lavu,lavfi,lavd: do not hardcode AV_PIX_FMT_NB value when setting pixel format max value
The constant may change in libavutil but the library may be compiled
against an older version, thus rejecting a value which is otherwise
supported by the new libavutil.
INT_MAX is used here to denote the max allowed value for a pixel format.
The opt-test code is changed to provide a valid reference example.
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.
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.
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.
Luca Barbato [Mon, 16 Dec 2013 05:40:24 +0000 (06:40 +0100)]
mms: Remove non-utf8 characters
Certain softwares get badly confused.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
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>
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>
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>
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>
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>
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>
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>
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>
Stefano Sabatini [Wed, 25 Dec 2013 18:13:23 +0000 (19:13 +0100)]
lavfi/volume: fix NULL reference in filter_frame()
Fix crash.
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
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.
Stefano Sabatini [Tue, 24 Dec 2013 13:38:48 +0000 (14:38 +0100)]
doc/protocols/udp,lavf/udp: apply minor documentation fixes
Stefano Sabatini [Wed, 25 Dec 2013 16:55:16 +0000 (17:55 +0100)]
lavfi/volume: extend volume logging
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.
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.
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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.
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>
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>
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>
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>
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>
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>
Diego Biurrun [Fri, 13 Dec 2013 17:50:48 +0000 (18:50 +0100)]
error.h: Do not circularly depend on avutil.h
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>
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>
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>
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>
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>
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>
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>
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>
Carl Eugen Hoyos [Mon, 23 Dec 2013 22:41:37 +0000 (23:41 +0100)]
Read pictures in id3v2.2
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>
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>
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>
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>