d128794fbc
Merge commit 'a1e2c47cd4fdaa64beda7e6dfa623b65c46f5012'
* commit 'a1e2c47cd4fdaa64beda7e6dfa623b65c46f5012':
libxvid: Return meaningful error messages
Conflicts:
libavcodec/libxvid.c
libavcodec/libxvid_rc.c
See: 2a89afb376
11 years ago
2e786bc498
avcodec/aac_adtstoasc_bsf: Clear extradata_size on allocation failure
This keeps the fields consistent
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
38e867f6c0
Merge commit '18f4fa251b0eb36392839f5bf6180f280dc04d8d'
* commit '18f4fa251b0eb36392839f5bf6180f280dc04d8d':
aac_adtstoasc_bsf: Check extradata memory allocation
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
62aec0c2d5
Merge commit 'fe0f4e56577a2dbd373bb50b0ae2d49e69d822fc'
* commit 'fe0f4e56577a2dbd373bb50b0ae2d49e69d822fc':
avpacket: Check buffer reference
Conflicts:
libavcodec/avpacket.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
7a7b77e6c9
Merge commit '31dc73e92a96f08d07650c0e7d31c0b9a1465d46'
* commit '31dc73e92a96f08d07650c0e7d31c0b9a1465d46':
vorbisdec: Check memory allocations
Conflicts:
libavcodec/vorbisdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
3d5c0ba816
Merge commit 'ec17782e17de1e8501ca213e276dfe5412ff1d11'
* commit 'ec17782e17de1e8501ca213e276dfe5412ff1d11':
dvdsubdec: Check memory allocations
Conflicts:
libavcodec/dvdsubdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
2a1b79d7e6
Merge commit 'e51f22122d23589e93ac4f0b3e570bb925755915'
* commit 'e51f22122d23589e93ac4f0b3e570bb925755915':
swscale: Check memory allocations
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
880cee0044
Merge commit '3035d21b5a77df0e9531df397fc06d59488996c7'
* commit '3035d21b5a77df0e9531df397fc06d59488996c7':
nutdec: Check memory allocations
Conflicts:
libavformat/nutdec.c
See: 55ae13e3de269845db86
11 years ago
95165f7c1b
avformat/movenc: Fix stts_entries allocation check
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
80c5dc5610
Merge commit 'a8765852158ecb2ae34895fa35ff51dc95c186f9'
* commit 'a8765852158ecb2ae34895fa35ff51dc95c186f9':
movenc: Check memory allocations
Conflicts:
libavformat/movenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
575ed4fe37
Merge commit 'da7e31a240f276836a0b90ca6c0714181b353cc4'
* commit 'da7e31a240f276836a0b90ca6c0714181b353cc4':
rmdec: Check memory allocations from ff_rm_alloc_rmstream()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
beae6ac5db
Merge commit 'd89e58f53939d91a88aa7042c94d9d1cd364da52'
* commit 'd89e58f53939d91a88aa7042c94d9d1cd364da52':
dct-test: Fix initialization syntax
See: 392b4b663c
11 years ago
563ed912ea
Merge commit 'bb7701684c7170dfd5f33a3c7d827265844619f2'
* commit 'bb7701684c7170dfd5f33a3c7d827265844619f2':
lavf: Document the codec context initialization
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
2980c8e7d3
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>
11 years ago
79216a189b
Merge commit '733f4b05f0e120ddd0393b23f2b6d9106cf922e4'
* commit '733f4b05f0e120ddd0393b23f2b6d9106cf922e4':
avplay: Check format allocation inside decode_thread()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
32b2b7bd8c
Merge commit '266f241193b2fa8c99bb8b1f007c66bedd3b7d97'
* commit '266f241193b2fa8c99bb8b1f007c66bedd3b7d97':
avplay: Check frame allocation inside video_thread()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
15cd2a93e7
Merge commit '81688e68f93f3142e2093f1a3d226edaeb179992'
* commit '81688e68f93f3142e2093f1a3d226edaeb179992':
avconv: Check rc_override memory allocation
Conflicts:
ffmpeg_opt.c
See: 7efabffc28
11 years ago
9d5017a20c
Merge commit '9d3b752fceb0f2a42cac7c2a1109b0629823c99f'
* commit '9d3b752fceb0f2a42cac7c2a1109b0629823c99f':
graphparser: Check av_get_token() memory error
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
a4cd057bc7
avformat/matroskaenc: Use the correct data type for the chapter times
Fixes potential integer overflow
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
d302853bca
Merge commit '5dc47a2bd52e375ed742c45d08356b45098f458d'
* commit '5dc47a2bd52e375ed742c45d08356b45098f458d':
matroskaenc: Validate chapter start and end times
Conflicts:
libavformat/matroskaenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
d2668ae472
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>
11 years ago
03dab49a12
avcodec/vp56: Add () to protect TRANSPOSE()s arguments
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
a1e2c47cd4
libxvid: Return meaningful error messages
11 years ago
18f4fa251b
aac_adtstoasc_bsf: Check extradata memory allocation
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
11 years ago
fe0f4e5657
avpacket: Check buffer reference
CC: libav-stable@libav.org
Bug-Id: CID 1267889
11 years ago
31dc73e92a
vorbisdec: Check memory allocations
11 years ago
ec17782e17
dvdsubdec: Check memory allocations
11 years ago
e51f22122d
swscale: Check memory allocations
CC: libav-stable@libav.org
Bug-Id: CID 1267888 / CID 1267890
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
11 years ago
3035d21b5a
nutdec: Check memory allocations
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
11 years ago
a876585215
movenc: Check memory allocations
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
11 years ago
da7e31a240
rmdec: Check memory allocations from ff_rm_alloc_rmstream()
Bug-Id: CID 1257835
11 years ago
d89e58f539
dct-test: Fix initialization syntax
Related to "warning: suggest braces around initialization of subobject".
11 years ago
bb7701684c
lavf: Document the codec context initialization
During remuxing avcodec_copy_context() is discouraged as certain fields
(such as codec_tag) could reflect invalid values between input and
output contextes.
11 years ago
cb70a93ca1
lavc: Document interaction between avcodec_open2() and decoding routines
11 years ago
733f4b05f0
avplay: Check format allocation inside decode_thread()
CC: libav-stable@libav.org
Bug-Id: CID 1265718
11 years ago
266f241193
avplay: Check frame allocation inside video_thread()
CC: libav-stable@libav.org
Bug-Id: CID 1267893
11 years ago
81688e68f9
avconv: Check rc_override memory allocation
CC: libav-stable@libav.org
Bug-Id: CID 1265719
11 years ago
9d3b752fce
graphparser: Check av_get_token() memory error
CC: libav-stable@libav.org
Bug-Id: CID 1267891
11 years ago
5dc47a2bd5
matroskaenc: Validate chapter start and end times
CC: libav-stable@libav.org
Bug-Id: CID 1265717
11 years ago
a00bab3475
avfilter/paletteuse: raise cache size from 64k to 512k
(or 32k to 256k in 32-bit)
11 years ago
398f531915
x86: hevc_mc: fewer xmm regs used in epel h/v
11 xmm regs seem only required for avx2.
Reviewed-by: Mickaël Raulet <mraulet@insa-rennes.fr
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
a9dc94c39c
Force linking against user32 if dxva2 is enabled.
Fixes compilation with vfwcap disabled.
Reported and tested by Bernhard Döbler, programmer bardware de
Reviewed-by: Matt Oliver
11 years ago
bc8e044d8c
x86/doc/Makefile: DBG=1 to preprocess external asm
The macro hell sometimes make it difficult to trace the source of
an error, so it is easier to analyze the preprocessed output.
This patch makes this automatical by specifying DBG=1 on the
command line: a file ffmpeg/dir/file.asm gets preprocessed to
builddir/dir/file.dbg.asm, which is then compiled.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
d9293c776e
x86inc: Correctly warn on use of SSE2 instructions in SSE functions
SSE2 instructions that are XMM-implementations of pre-existing MMX/MMX2
instructions did not issue warnings when used in SSE functions. Handle
it by also checking the register type when such instructions are used.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
2bae7b3370
avfilter/vf_fieldmatch: Add () to protect the arguments of the HAS_FF_AROUND() macro
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
f15c734be1
avfilter/vf_phase: Add () to protect DIFF()s arguments
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
0cb95f9082
swresample/resample_template: Add () to protect the arguments of the OUT() macro
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
52d1929000
avutil/aes: Add () to protect the ROT() arguments
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
06309fc704
avutil/attributes: Add () to protect the AV_GCC_VERSION_AT_LEAST() arguments
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
f8607cfb0a
avutil/intmath: Add () to protect the ff_log2() argument
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
Michael Niedermayer
Himangi Saraogi
Vittorio Giovara
Federico Tomassetti
Hugo Beauzée-Luyssen
Clément Bœsch
Christophe Gisquet
Carl Eugen Hoyos