OSDN Git Service
Michael Niedermayer [Fri, 20 Feb 2015 19:14:56 +0000 (20:14 +0100)]
avformat/gxf: Use 64bit for res to avoid overflow
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 20 Feb 2015 19:13:06 +0000 (20:13 +0100)]
avformat/idcin: Use 64bit for ret to avoid overflow
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 20 Feb 2015 18:31:10 +0000 (19:31 +0100)]
avformat/apngdec: Use 64bit ret to avoid overflow
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 20 Feb 2015 18:29:12 +0000 (19:29 +0100)]
avformat/asfdec: Use 64bit ret to avoid overflow
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Rodger Combs [Fri, 20 Feb 2015 15:30:04 +0000 (09:30 -0600)]
wtvdec: fix integer overflow resulting in errors with large files
This fixes a regression in
9fbc613f0df1628e7e78bca791fa8833846f8210
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 20 Feb 2015 15:17:46 +0000 (16:17 +0100)]
MAINTAINERS: Add Oleksij as maintainer for DSS*
Also add a 2nd maintainer at the authors request (due to lack of time)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Hendrik Leppkes [Fri, 20 Feb 2015 11:55:13 +0000 (12:55 +0100)]
hlsenc: remove the AVIOContext for the playlist from the muxer context
Its only used in one function, having it in the context serves no purpose.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Kevin Wheatley [Mon, 16 Feb 2015 10:40:36 +0000 (10:40 +0000)]
avformat/movenc: Move avid DNxHD padding to the correct spot
Outputting DNxHD into .mov containers 'corrupts' following atoms until end of stsd
ffmpeg and qtdump could not decode pasp/colr atoms in the files made by ffmpeg,
when outputting DNxHD due to the incorrect padding placement. Now we add the
padding in the correct place
Tidy up FATE changes due to padding changes.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 20 Feb 2015 10:11:33 +0000 (11:11 +0100)]
avcodec/dca: move remaining tables to dcadata
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 20 Feb 2015 02:19:02 +0000 (03:19 +0100)]
avcodec/snowdec: Fix avmv_index increment
Fixes reading uninitialized memory
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Arwa Arif [Wed, 18 Feb 2015 19:56:44 +0000 (01:26 +0530)]
avfilter/vf_eq: Add process_command to eq.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 19 Feb 2015 21:49:57 +0000 (22:49 +0100)]
avcodec/dss_sp: Avoid a slow division and modulo in the pitch_lag calculation
Also check the combined_pitch for validity (which is needed to keep the behavior
identical in the error case)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 19 Feb 2015 21:41:41 +0000 (22:41 +0100)]
avcodec/dss_sp: de-obfuscate index inversion
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 19 Feb 2015 21:29:02 +0000 (22:29 +0100)]
avcodec/dss_sp: Protect DSS_SP_FORMULA() with a set of outside brackets
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 19 Feb 2015 21:15:22 +0000 (22:15 +0100)]
avformat/dss: Use av_freep() to avoid leaving stale pointers in memory
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 19 Feb 2015 21:10:47 +0000 (22:10 +0100)]
avformat/dss: Check sscanf() return value in dss_read_metadata_date()
Fixes writing uninitialized values into metadata without error in case
parsing fails
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 19 Feb 2015 20:53:39 +0000 (21:53 +0100)]
Merge commit '
b727b0eeb73cd78533a7fd387ceccd505e48fa6c'
* commit '
b727b0eeb73cd78533a7fd387ceccd505e48fa6c':
fate: Add tests for DSS
Conflicts:
tests/fate/audio.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 19 Feb 2015 20:44:58 +0000 (21:44 +0100)]
Merge commit '
062cd5a975ff7bd6fb91f9b4d1d9d102a7545499'
* commit '
062cd5a975ff7bd6fb91f9b4d1d9d102a7545499':
lavf: Add DSS demuxer
Conflicts:
libavformat/Makefile
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 19 Feb 2015 20:31:26 +0000 (21:31 +0100)]
Merge commit '
c56b9b1eb278c5ef89d3f0832a56dfe4732cb68b'
* commit '
c56b9b1eb278c5ef89d3f0832a56dfe4732cb68b':
lavc: Add DSS SP decoder
Conflicts:
libavcodec/avcodec.h
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 19 Feb 2015 20:12:29 +0000 (21:12 +0100)]
Merge commit '
0fbb271318899a0fb1fbcbb3db8292e909b91e23'
* commit '
0fbb271318899a0fb1fbcbb3db8292e909b91e23':
qsv_api: fix building with libmfx disabled
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 19 Feb 2015 20:12:16 +0000 (21:12 +0100)]
Merge commit '
11c22dfd495bbd3f38df639772aa4bb9a1be882d'
* commit '
11c22dfd495bbd3f38df639772aa4bb9a1be882d':
configure: add missing h264_qsv hwaccel deps
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 19 Feb 2015 19:52:29 +0000 (20:52 +0100)]
Merge commit '
4e08c821106fc1d6d358864abf0d8488b12f38c6'
* commit '
4e08c821106fc1d6d358864abf0d8488b12f38c6':
lavc: add an Intel libmfx-based H.264 decoder
Conflicts:
configure
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 19 Feb 2015 19:39:04 +0000 (20:39 +0100)]
Merge commit '
31d2039cb42668ebcf08248bc48bbad44aa05f49'
* commit '
31d2039cb42668ebcf08248bc48bbad44aa05f49':
h264_parser: export video format and dimensions
Conflicts:
libavcodec/h264_parser.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 19 Feb 2015 19:23:48 +0000 (20:23 +0100)]
Merge commit '
5b1d9ceec715846a58fe029bc3889ed6fa62436a'
* commit '
5b1d9ceec715846a58fe029bc3889ed6fa62436a':
pixfmt: add a pixel format for QSV hwaccel
Conflicts:
doc/APIchanges
libavutil/pixfmt.h
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Vittorio Giovara [Fri, 13 Feb 2015 07:36:18 +0000 (08:36 +0100)]
fate: Add tests for DSS
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Oleksij Rempel <linux@rempel-privat.de>
Oleksij Rempel [Fri, 13 Feb 2015 07:36:17 +0000 (08:36 +0100)]
lavf: Add DSS demuxer
Signed-off-by: Oleksij Rempel <linux@rempel-privat.de>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Oleksij Rempel [Fri, 13 Feb 2015 07:36:16 +0000 (08:36 +0100)]
lavc: Add DSS SP decoder
Signed-off-by: Oleksij Rempel <linux@rempel-privat.de>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Anton Khirnov [Thu, 19 Feb 2015 16:35:34 +0000 (17:35 +0100)]
qsv_api: fix building with libmfx disabled
Anton Khirnov [Thu, 19 Feb 2015 16:32:55 +0000 (17:32 +0100)]
configure: add missing h264_qsv hwaccel deps
Michael Niedermayer [Thu, 19 Feb 2015 15:36:48 +0000 (16:36 +0100)]
Merge remote-tracking branch 'cigaes/master'
* cigaes/master:
doc/faq: explain DAR/SAR preserving.
doc: set documentencoding on toplevel texi files.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Kevin Wheatley [Thu, 19 Feb 2015 11:08:14 +0000 (11:08 +0000)]
avformat/mov: Add simple ACLR atom reading to set the color range of the incomming track for codec's like DNxHD that utilise AVID's proprietary atom.
On input ACLR will be used to set colour range no matter which codec
it is associated with.
No change for when it will be output.
Rework mov_read_extradata function to allow detection of truncated
atom reads by callers.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Tue, 10 Feb 2015 09:40:59 +0000 (10:40 +0100)]
lavc: add an Intel libmfx-based H.264 decoder
Based on the code by Luca Barbato <lu_zero@gentoo.org> and Yukinori
Yamazoe <drocon11@gmail.com>.
Anton Khirnov [Mon, 9 Feb 2015 13:41:50 +0000 (14:41 +0100)]
h264_parser: export video format and dimensions
Anton Khirnov [Sat, 7 Feb 2015 11:14:45 +0000 (12:14 +0100)]
pixfmt: add a pixel format for QSV hwaccel
Nicolas George [Mon, 9 Feb 2015 15:17:22 +0000 (16:17 +0100)]
doc/faq: explain DAR/SAR preserving.
Nicolas George [Mon, 9 Feb 2015 15:17:44 +0000 (16:17 +0100)]
doc: set documentencoding on toplevel texi files.
Fix double UTF-8 encoding on output files.
makeinfo / texi2any does not seem to provide a way of setting
it globally for toplevel files.
Clément Bœsch [Thu, 19 Feb 2015 10:17:43 +0000 (11:17 +0100)]
avfilter/palettegen: raise cache size from 64k to 512k
(or 32k to 256k in 32-bit)
This is similar to
a00bab347518d4824d51ec7078f1d84ca097c53b
Michael Niedermayer [Thu, 19 Feb 2015 09:51:19 +0000 (10:51 +0100)]
Merge commit '
0f532fd3f9b9ca974cea0feb8ddcaf4a7f3b23c5'
* commit '
0f532fd3f9b9ca974cea0feb8ddcaf4a7f3b23c5':
rv40: Return more meaningful error codes
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Himangi Saraogi [Thu, 19 Feb 2015 07:14:19 +0000 (12:44 +0530)]
rv40: Return more meaningful error codes
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Michael Niedermayer [Thu, 19 Feb 2015 02:14:50 +0000 (03:14 +0100)]
avcodec/wmalosslessdec: use sizeof() instead of a literal number
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 19 Feb 2015 00:51:54 +0000 (01:51 +0100)]
avfilter/vf_subtitles: Add () to protect the argument of the AA() macro
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 18 Feb 2015 21:50:41 +0000 (22:50 +0100)]
avutil/sha: Protect macro arguments with ()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 18 Feb 2015 21:12:12 +0000 (22:12 +0100)]
ffmpeg_opt: Add missing MATCH_PER_TYPE_OPT() for data codecs
Fixes: CID1270809
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 18 Feb 2015 19:35:06 +0000 (20:35 +0100)]
Michael Niedermayer [Wed, 18 Feb 2015 19:25:41 +0000 (20:25 +0100)]
Merge commit '
2de887e45b664f44b51686f5979fa8ce6dfe2ec2'
* commit '
2de887e45b664f44b51686f5979fa8ce6dfe2ec2':
libx265: Reduce the scope of some variables
See:
b920db67317a31f0e8d4a010faa26dbd12b0dcdb
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Supraja Meedinti [Wed, 18 Feb 2015 13:13:03 +0000 (18:43 +0530)]
tests: fate: adding fate-test for twofish
Signed-off-by: Supraja Meedinti <supraja0493@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 18 Feb 2015 15:18:26 +0000 (16:18 +0100)]
avformat/movenc: Fix use of uninitialized variable (ret)
Fixed CID1270823
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Derek Buitenhuis [Tue, 17 Feb 2015 22:04:53 +0000 (17:04 -0500)]
libx265: Add crf private option
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Tue, 17 Feb 2015 22:04:51 +0000 (17:04 -0500)]
libx265: Reduce the scope of some variables
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Tue, 17 Feb 2015 22:04:53 +0000 (17:04 -0500)]
libx265: Add crf private option
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Derek Buitenhuis [Tue, 17 Feb 2015 22:04:51 +0000 (17:04 -0500)]
libx265: Reduce the scope of some variables
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Michael Niedermayer [Wed, 18 Feb 2015 13:31:11 +0000 (14:31 +0100)]
avformat/ffmenc: Use av_freep() to avoid leaving stale pointers in memory
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 18 Feb 2015 13:30:15 +0000 (14:30 +0100)]
avformat/ffmenc: Fix memleak of buf
Fixes CID1257015
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Wed, 18 Feb 2015 12:55:47 +0000 (13:55 +0100)]
avfilter/showpalette: fix leak in case of error
Fixes CID1270820
Fixes CID1270818
Clément Bœsch [Wed, 18 Feb 2015 12:52:36 +0000 (13:52 +0100)]
avfilter/palettegen: fix leak in case of error
Clément Bœsch [Wed, 18 Feb 2015 12:48:41 +0000 (13:48 +0100)]
avfilter/paletteuse: fix leak in case of error
Fixes CID1270819
Michael Niedermayer [Wed, 18 Feb 2015 12:40:39 +0000 (13:40 +0100)]
avfilter/af_channelmap: Move potential dereference after NULL check in get_channel_idx()
Fixes CID1270822
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 18 Feb 2015 12:12:06 +0000 (13:12 +0100)]
avfilter/vf_qp: Fix leak of out_qp_table_buf
Fixes CID1270821
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 18 Feb 2015 10:55:44 +0000 (11:55 +0100)]
avfilter/avfiltergraph: assert that the heap_bubble index is valid
This might help coverity
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 18 Feb 2015 10:20:39 +0000 (11:20 +0100)]
avcodec/faxcompr: Fix memleak
Fixes CID1270816
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Tue, 17 Feb 2015 17:31:47 +0000 (17:31 +0000)]
avcodec/opusdec: remove unused headers
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Wed, 18 Feb 2015 00:56:19 +0000 (01:56 +0100)]
avfilter/vf_removelogo: Add () to protect the argument of apply_mask_fudge_factor()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 18 Feb 2015 00:55:15 +0000 (01:55 +0100)]
swscale/bayer_template: Add () to protect the argument of BAYER_READ()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 18 Feb 2015 00:39:57 +0000 (01:39 +0100)]
compat/avisynth/windowsPorts/windows2linux: Add () to protect macro arguments
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 18 Feb 2015 00:37:06 +0000 (01:37 +0100)]
avcodec/wavpack: Add () to protect the arguments of UPDATE_WEIGHT_CLIP()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 18 Feb 2015 00:34:50 +0000 (01:34 +0100)]
avcodec/wmalosslessdec: Add () to protect the arguments of WMASIGN()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Supraja Meedinti [Tue, 17 Feb 2015 19:18:53 +0000 (00:48 +0530)]
libavutil: optimize twofish cipher
before:
lavu TWOFISH size:
1048576 runs: 1024 time: 90.052 +- 4.630
after:
lavu TWOFISH size:
1048576 runs: 1024 time: 18.085 +- 0.241
gcrypt TWOFISH size:
1048576 runs: 1024 time: 25.666 +- 0.307
tomcrypt TWOFISH size:
1048576 runs: 1024 time: 18.428 +- 0.363
Signed-off-by: Supraja Meedinti <supraja0493@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 17 Feb 2015 22:50:56 +0000 (23:50 +0100)]
Merge commit '
195942ed9b9b563ec86d34b73aa2c1ee8715d59d'
* commit '
195942ed9b9b563ec86d34b73aa2c1ee8715d59d':
riff: Support QT RLE Animation in avi ('rle ' FourCC)
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 17 Feb 2015 22:42:26 +0000 (23:42 +0100)]
Merge commit '
c78dc12118cb5b2a69a17f38c69f77a42e89a9c4'
* commit '
c78dc12118cb5b2a69a17f38c69f77a42e89a9c4':
riff: Support ProRes in avi (APCH fourcc)
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 17 Feb 2015 22:34:36 +0000 (23:34 +0100)]
Merge commit '
42c8f92e2fa390fa17b03d37b4323ec0d721d4cd'
* commit '
42c8f92e2fa390fa17b03d37b4323ec0d721d4cd':
wmv2: Return meaningful error codes
Conflicts:
libavcodec/wmv2dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 17 Feb 2015 22:26:28 +0000 (23:26 +0100)]
Merge commit '
f3e045263e445c4ab54d85ecae359494cd96a3e2'
* commit '
f3e045263e445c4ab54d85ecae359494cd96a3e2':
qdm2: Return meaningful error codes
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 17 Feb 2015 22:12:29 +0000 (23:12 +0100)]
Merge commit '
a1e2c47cd4fdaa64beda7e6dfa623b65c46f5012'
* commit '
a1e2c47cd4fdaa64beda7e6dfa623b65c46f5012':
libxvid: Return meaningful error messages
Conflicts:
libavcodec/libxvid.c
libavcodec/libxvid_rc.c
See:
2a89afb376aebe833bee0b5958cec16c48936b03 and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 17 Feb 2015 21:58:31 +0000 (22:58 +0100)]
avcodec/aac_adtstoasc_bsf: Clear extradata_size on allocation failure
This keeps the fields consistent
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 17 Feb 2015 21:54:56 +0000 (22:54 +0100)]
Merge commit '
18f4fa251b0eb36392839f5bf6180f280dc04d8d'
* commit '
18f4fa251b0eb36392839f5bf6180f280dc04d8d':
aac_adtstoasc_bsf: Check extradata memory allocation
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 17 Feb 2015 21:46:59 +0000 (22:46 +0100)]
Merge commit '
fe0f4e56577a2dbd373bb50b0ae2d49e69d822fc'
* commit '
fe0f4e56577a2dbd373bb50b0ae2d49e69d822fc':
avpacket: Check buffer reference
Conflicts:
libavcodec/avpacket.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 17 Feb 2015 21:39:32 +0000 (22:39 +0100)]
Merge commit '
31dc73e92a96f08d07650c0e7d31c0b9a1465d46'
* commit '
31dc73e92a96f08d07650c0e7d31c0b9a1465d46':
vorbisdec: Check memory allocations
Conflicts:
libavcodec/vorbisdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 17 Feb 2015 21:30:58 +0000 (22:30 +0100)]
Merge commit '
ec17782e17de1e8501ca213e276dfe5412ff1d11'
* commit '
ec17782e17de1e8501ca213e276dfe5412ff1d11':
dvdsubdec: Check memory allocations
Conflicts:
libavcodec/dvdsubdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 17 Feb 2015 21:21:22 +0000 (22:21 +0100)]
Merge commit '
e51f22122d23589e93ac4f0b3e570bb925755915'
* commit '
e51f22122d23589e93ac4f0b3e570bb925755915':
swscale: Check memory allocations
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 17 Feb 2015 21:08:46 +0000 (22:08 +0100)]
Michael Niedermayer [Tue, 17 Feb 2015 20:51:35 +0000 (21:51 +0100)]
avformat/movenc: Fix stts_entries allocation check
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 17 Feb 2015 20:50:08 +0000 (21:50 +0100)]
Merge commit '
a8765852158ecb2ae34895fa35ff51dc95c186f9'
* commit '
a8765852158ecb2ae34895fa35ff51dc95c186f9':
movenc: Check memory allocations
Conflicts:
libavformat/movenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 17 Feb 2015 20:42:08 +0000 (21:42 +0100)]
Merge commit '
da7e31a240f276836a0b90ca6c0714181b353cc4'
* commit '
da7e31a240f276836a0b90ca6c0714181b353cc4':
rmdec: Check memory allocations from ff_rm_alloc_rmstream()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 17 Feb 2015 20:35:13 +0000 (21:35 +0100)]
Merge commit '
d89e58f53939d91a88aa7042c94d9d1cd364da52'
* commit '
d89e58f53939d91a88aa7042c94d9d1cd364da52':
dct-test: Fix initialization syntax
See:
392b4b663c450f5522f7c1442da91f7647db6bf0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 17 Feb 2015 20:26:00 +0000 (21:26 +0100)]
Merge commit '
bb7701684c7170dfd5f33a3c7d827265844619f2'
* commit '
bb7701684c7170dfd5f33a3c7d827265844619f2':
lavf: Document the codec context initialization
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 17 Feb 2015 20:25:07 +0000 (21:25 +0100)]
Merge commit '
cb70a93ca1e7fae1b5dfb65ad149d311a65206a4'
* commit '
cb70a93ca1e7fae1b5dfb65ad149d311a65206a4':
lavc: Document interaction between avcodec_open2() and decoding routines
Conflicts:
libavcodec/avcodec.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 17 Feb 2015 20:16:22 +0000 (21:16 +0100)]
Merge commit '
733f4b05f0e120ddd0393b23f2b6d9106cf922e4'
* commit '
733f4b05f0e120ddd0393b23f2b6d9106cf922e4':
avplay: Check format allocation inside decode_thread()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 17 Feb 2015 20:08:33 +0000 (21:08 +0100)]
Merge commit '
266f241193b2fa8c99bb8b1f007c66bedd3b7d97'
* commit '
266f241193b2fa8c99bb8b1f007c66bedd3b7d97':
avplay: Check frame allocation inside video_thread()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 17 Feb 2015 20:00:04 +0000 (21:00 +0100)]
Merge commit '
81688e68f93f3142e2093f1a3d226edaeb179992'
* commit '
81688e68f93f3142e2093f1a3d226edaeb179992':
avconv: Check rc_override memory allocation
Conflicts:
ffmpeg_opt.c
See:
7efabffc2899b76688a40b4bd7c63370eb2d8ca8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 17 Feb 2015 19:48:05 +0000 (20:48 +0100)]
Merge commit '
9d3b752fceb0f2a42cac7c2a1109b0629823c99f'
* commit '
9d3b752fceb0f2a42cac7c2a1109b0629823c99f':
graphparser: Check av_get_token() memory error
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 17 Feb 2015 19:40:00 +0000 (20:40 +0100)]
avformat/matroskaenc: Use the correct data type for the chapter times
Fixes potential integer overflow
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 17 Feb 2015 19:25:47 +0000 (20:25 +0100)]
Merge commit '
5dc47a2bd52e375ed742c45d08356b45098f458d'
* commit '
5dc47a2bd52e375ed742c45d08356b45098f458d':
matroskaenc: Validate chapter start and end times
Conflicts:
libavformat/matroskaenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 17 Feb 2015 19:18:19 +0000 (20:18 +0100)]
Merge commit '
f8c1719771dc4ac2e13e6bc8bf741854a30e3a86'
* commit '
f8c1719771dc4ac2e13e6bc8bf741854a30e3a86':
dca: Remove separate header for DCA ExSS
Conflicts:
libavcodec/dca.h
libavcodec/dca_exss.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 17 Feb 2015 17:57:26 +0000 (18:57 +0100)]
avcodec/vp56: Add () to protect TRANSPOSE()s arguments
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Vittorio Giovara [Thu, 12 Feb 2015 16:04:58 +0000 (11:04 -0500)]
riff: Support QT RLE Animation in avi ('rle ' FourCC)
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Vittorio Giovara [Tue, 10 Feb 2015 19:33:24 +0000 (14:33 -0500)]
riff: Support ProRes in avi (APCH fourcc)
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Himangi Saraogi [Sun, 15 Feb 2015 23:41:08 +0000 (05:11 +0530)]
wmv2: Return meaningful error codes
Himangi Saraogi [Sun, 15 Feb 2015 23:58:45 +0000 (05:28 +0530)]
qdm2: Return meaningful error codes
Himangi Saraogi [Tue, 10 Feb 2015 18:57:35 +0000 (00:27 +0530)]
libxvid: Return meaningful error messages
Himangi Saraogi [Tue, 10 Feb 2015 22:07:40 +0000 (03:37 +0530)]
aac_adtstoasc_bsf: Check extradata memory allocation
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Vittorio Giovara [Mon, 2 Feb 2015 19:53:51 +0000 (20:53 +0100)]
avpacket: Check buffer reference
CC: libav-stable@libav.org
Bug-Id: CID
1267889