generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
69,891 Commits 24 Branches 241 Tags 173 MiB
80c5dc5610
Commit Graph

69891 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
80c5dc5610 Merge commit 'a8765852158ecb2ae34895fa35ff51dc95c186f9' 
* commit 'a8765852158ecb2ae34895fa35ff51dc95c186f9':
  movenc: Check memory allocations

Conflicts:
	libavformat/movenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-17 21:50:08 +01:00
Michael Niedermayer
575ed4fe37 Merge commit 'da7e31a240f276836a0b90ca6c0714181b353cc4' 
* commit 'da7e31a240f276836a0b90ca6c0714181b353cc4':
  rmdec: Check memory allocations from ff_rm_alloc_rmstream()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-17 21:42:36 +01:00
Michael Niedermayer
beae6ac5db Merge commit 'd89e58f53939d91a88aa7042c94d9d1cd364da52' 
* commit 'd89e58f53939d91a88aa7042c94d9d1cd364da52':
  dct-test: Fix initialization syntax

See: 392b4b663c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-17 21:36:01 +01:00
Michael Niedermayer
563ed912ea Merge commit 'bb7701684c7170dfd5f33a3c7d827265844619f2' 
* commit 'bb7701684c7170dfd5f33a3c7d827265844619f2':
  lavf: Document the codec context initialization

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-17 21:26:04 +01:00
Michael Niedermayer
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>
 2015-02-17 21:25:07 +01:00
Michael Niedermayer
79216a189b Merge commit '733f4b05f0e120ddd0393b23f2b6d9106cf922e4' 
* commit '733f4b05f0e120ddd0393b23f2b6d9106cf922e4':
  avplay: Check format allocation inside decode_thread()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-17 21:16:34 +01:00
Michael Niedermayer
32b2b7bd8c Merge commit '266f241193b2fa8c99bb8b1f007c66bedd3b7d97' 
* commit '266f241193b2fa8c99bb8b1f007c66bedd3b7d97':
  avplay: Check frame allocation inside video_thread()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-17 21:09:11 +01:00
Michael Niedermayer
15cd2a93e7 Merge commit '81688e68f93f3142e2093f1a3d226edaeb179992' 
* commit '81688e68f93f3142e2093f1a3d226edaeb179992':
  avconv: Check rc_override memory allocation

Conflicts:
	ffmpeg_opt.c

See: 7efabffc28
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-17 21:00:04 +01:00
Michael Niedermayer
9d5017a20c Merge commit '9d3b752fceb0f2a42cac7c2a1109b0629823c99f' 
* commit '9d3b752fceb0f2a42cac7c2a1109b0629823c99f':
  graphparser: Check av_get_token() memory error

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-17 20:48:22 +01:00
Michael Niedermayer
a4cd057bc7 avformat/matroskaenc: Use the correct data type for the chapter times 
Fixes potential integer overflow

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-17 20:40:00 +01:00
Michael Niedermayer
d302853bca Merge commit '5dc47a2bd52e375ed742c45d08356b45098f458d' 
* commit '5dc47a2bd52e375ed742c45d08356b45098f458d':
  matroskaenc: Validate chapter start and end times

Conflicts:
	libavformat/matroskaenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-17 20:25:47 +01:00
Michael Niedermayer
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>
 2015-02-17 20:18:19 +01:00
Michael Niedermayer
03dab49a12 avcodec/vp56: Add () to protect TRANSPOSE()s arguments 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-17 19:13:26 +01:00
Hugo Beauzée-Luyssen
a876585215 movenc: Check memory allocations 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2015-02-17 12:16:43 -05:00
Hugo Beauzée-Luyssen
da7e31a240 rmdec: Check memory allocations from ff_rm_alloc_rmstream() 
Bug-Id: CID 1257835
 2015-02-17 12:16:43 -05:00
Vittorio Giovara
d89e58f539 dct-test: Fix initialization syntax 
Related to "warning: suggest braces around initialization of subobject".
 2015-02-17 11:27:42 -05:00
Vittorio Giovara
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.
 2015-02-17 11:27:42 -05:00
Vittorio Giovara
cb70a93ca1 lavc: Document interaction between avcodec_open2() and decoding routines 2015-02-17 11:27:42 -05:00
Vittorio Giovara
733f4b05f0 avplay: Check format allocation inside decode_thread() 
CC: libav-stable@libav.org
Bug-Id: CID 1265718
 2015-02-17 11:27:41 -05:00
Vittorio Giovara
266f241193 avplay: Check frame allocation inside video_thread() 
CC: libav-stable@libav.org
Bug-Id: CID 1267893
 2015-02-17 11:27:41 -05:00
Vittorio Giovara
81688e68f9 avconv: Check rc_override memory allocation 
CC: libav-stable@libav.org
Bug-Id: CID 1265719
 2015-02-17 11:27:41 -05:00
Vittorio Giovara
9d3b752fce graphparser: Check av_get_token() memory error 
CC: libav-stable@libav.org
Bug-Id: CID 1267891
 2015-02-17 11:27:41 -05:00
Vittorio Giovara
5dc47a2bd5 matroskaenc: Validate chapter start and end times 
CC: libav-stable@libav.org
Bug-Id: CID 1265717
 2015-02-17 11:27:41 -05:00
Clément Bœsch
a00bab3475 avfilter/paletteuse: raise cache size from 64k to 512k 
(or 32k to 256k in 32-bit)
 2015-02-17 17:20:42 +01:00
Christophe Gisquet
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>
 2015-02-17 15:19:19 +01:00
Carl Eugen Hoyos
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
 2015-02-17 13:25:23 +01:00
Christophe Gisquet
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>
 2015-02-17 13:08:04 +01:00
Christophe Gisquet
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>
 2015-02-17 12:35:58 +01:00
Michael Niedermayer
2bae7b3370 avfilter/vf_fieldmatch: Add () to protect the arguments of the HAS_FF_AROUND() macro 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-17 00:49:32 +01:00
Michael Niedermayer
f15c734be1 avfilter/vf_phase: Add () to protect DIFF()s arguments 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-17 00:47:47 +01:00
Michael Niedermayer
0cb95f9082 swresample/resample_template: Add () to protect the arguments of the OUT() macro 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-17 00:36:35 +01:00
Michael Niedermayer
52d1929000 avutil/aes: Add () to protect the ROT() arguments 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-17 00:22:42 +01:00
Michael Niedermayer
06309fc704 avutil/attributes: Add () to protect the AV_GCC_VERSION_AT_LEAST() arguments 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-17 00:21:48 +01:00
Michael Niedermayer
f8607cfb0a avutil/intmath: Add () to protect the ff_log2() argument 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-17 00:20:49 +01:00
Michael Niedermayer
cdee0c9d5f avutil/murmur3: Add () to protect the ROT() arguments 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-17 00:18:15 +01:00
Michael Niedermayer
9cde41cdb5 avutil/version: Add () to protect the AV_VERSION_INT() arguments 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-17 00:17:47 +01:00
Michael Niedermayer
527f1d22a1 avformat/tedcaptionsdec: add () to protect the argument of ERR_CODE() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-17 00:05:51 +01:00
Michael Niedermayer
61eb602d27 avutil/log: add () to protect the argument of AV_LOG_C() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-17 00:04:22 +01:00
Michael Niedermayer
e3f7142306 avcodec/vc1dsp: add () to protect the arguments of the op* macros 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-17 00:02:40 +01:00
Michael Niedermayer
cb9d40451c avcodec/ac3: add () to protect the macro arguments 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-16 23:59:39 +01:00
Michael Niedermayer
0b638b83c6 avformat/mpc8: Add () to protect MKMPCTAG()s arguments 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-16 23:14:27 +01:00
Michael Niedermayer
235782260d avcodec/me_cmp: add () to protect avg*s arguments 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-16 23:13:00 +01:00
Michael Niedermayer
17a62cbcb9 avcodec/bmvvideo: Add () to protect NEXT_BYTE() argument 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-16 23:09:09 +01:00
Michael Niedermayer
37013fd018 swresample/swresample-test: Add () to protect uint_rand() argument 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-16 23:09:09 +01:00
Michael Niedermayer
ced26a2c65 avformat/tls: add () to protect macro arguments 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-16 23:09:08 +01:00
James Almer
6e3651983c avcodec/hevcdsp: add missing () to CMP macro 
Found-by: Clément Bœsch <u@pkh.me>
Signed-off-by: James Almer <jamrial@gmail.com>
 2015-02-16 18:56:16 -03:00
Christophe Gisquet
89cb4995fa x86: hevc_mc: save 1 gpr in epel filter loading 
The 3*stride value stored in r3src can be loaded much later,
so use r3src instead of a dedicated gpr when possible.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-16 21:53:51 +01:00
James Almer
22596383f3 avcodec/hevcdsp: optimize pixel comparison in sao_edge_filter 
GCC 4.9.2 on a Core i5-4200U @ 1.60GHz, Linux x86_64

Before
715487 decicycles in sao_edge_filter_8, 262144 runs, 0 skips

After
672104 decicycles in sao_edge_filter_8, 262144 runs, 0 skips

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
 2015-02-16 17:47:47 -03:00
wm4
4bf3fab281 hls: fix a null pointer dereference 
Not allocating the pls->ctx will crash in libavformat/hls.c:1410, where
it tries to dereference the field.

Sample: http://ec24.rtp.pt/liverepeater/rtpn.smil/playlist.m3u8

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-16 19:59:04 +01:00
zhaoxiu.zeng
bf99068089 avcodec/vc1_mc: factor out helper functions for scaling blocks 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-16 19:44:46 +01:00