virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-12 19:18:44 +02:00
Code Issues Releases Activity
65,841 Commits 37 Branches 400 Tags 463 MiB
7444cf9a9c
Commit Graph

65841 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
da7d839a0d ffv1dec: check that global parameters do not change in version 0/1 
Such changes are neither allowed nor supported

Found-by: ami_stuff
Bug-Id: CVE-2013-7020
CC: libav-stable@libav.org
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2014-08-12 10:21:21 +00:00
Christophe Gisquet
3187fa14a3 hevc_mvs: avoid deriving tmvp in amvp 
Reduces the number of calls to tmvp derivation from 933685 to 586271 on
a sequence.

Reviewed-by: Mickaël Raulet <mraulet@insa-rennes.fr>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2014-08-12 10:13:43 +00:00
Christophe Gisquet
14ca0aa69b hevc: wait proper position for tmvp 
The position is either rounded or not checked, so delay the wait to
check the proper value.

Reviewed-by: Mickaël Raulet <mraulet@insa-rennes.fr>

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2014-08-12 10:13:21 +00:00
Christophe Gisquet
cf6090dc62 hevc: use intreadwrite 
When dealing with MVs, both components may be processed at a time.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2014-08-12 10:03:20 +00:00
Christophe Gisquet
ed53cc217f hevc: derive partial merge list 
The merge list only needs to be derived up to the merge index.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2014-08-12 09:59:30 +00:00
Christophe Gisquet
3505b19652 hevc: derive partially amvp list 
When the candidate has been found, no need to derive others.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2014-08-12 09:58:14 +00:00
Christophe Gisquet
09182b3224 hevc: simplify rounding 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2014-08-12 09:57:25 +00:00
Christophe Gisquet
d1b1c3bb5e hevc: reorder loops 
iterate over memory in a more continuous order

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2014-08-12 09:57:05 +00:00
Martin Storsjö
223c374a9d configure: Check for nanosleep in headers as well, not only in libs 
On mingw64 with c++11 support, the link libraries do contain a
nanosleep function, while it isn't exposed via the headers. Using
check_func_headers instead of a plain check_func fixes this
misdetection.

Suggested-by: Hendrik Leppkes <h.leppkes@gmail.com>
See: [FFmpeg-devel] [PATCH] fix: 'make' with mingw32
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-12 11:25:05 +02:00
Carl Eugen Hoyos
99867fc0c4 Fix warning if https protocol was requested but isn't available. 2014-08-12 10:03:36 +02:00
Carl Eugen Hoyos
fddea3f074 Check for hevc startcode when muxing into mpeg-ts. 2014-08-12 08:48:20 +02:00
James Almer
d6711ee648 lavu: stop exporting internal functions 
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-12 04:35:52 +02:00
James Almer
744f15b6b3 lavu: rename ff_opencl_set_parameter() to avpriv_opencl_set_parameter() 
It was wrongly being exported and used by libavfilter.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-12 03:49:45 +02:00
Daniel Oberhoff
9f617a14a0 avfilter: ported lenscorrection filter from frei0r 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-12 03:33:30 +02:00
Christophe Gisquet
52b81ff463 proresenc_kostya: report buffer overflow 
If the allocated size, despite best efforts, is too small, exit
with the appropriate error.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-12 00:46:37 +02:00
Christophe Gisquet
bf10f09bcc proresenc_kostya: remove unneeded parameters 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-12 00:46:37 +02:00
Reimar Döffinger
2c0454cd20 Add missing initialization for AVProbeData. 
This has become necessary since the new mime field was added.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2014-08-11 21:10:22 +02:00
Michael Niedermayer
9a162146ca avcodec/snow: fix null pointer dereference in cleanup after allocation failure 
Fixes: snowf.avi
Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-11 15:37:15 +02:00
Michael Niedermayer
ba47d519e5 avcodec/huffyuvdec: fix overread checks 
Fixes: ffvhuff_f.avi
Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-11 15:17:11 +02:00
Michael Niedermayer
11512d70fa avcodec/get_bits: add BITS_LEFT() for finding the bits left with an opened reader 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-11 15:15:54 +02:00
James Almer
7b3de03c8f lavf: stop exporting internal functions 
Except for those currently used by ffserver.

Signed-off-by: James Almer <jamrial@gmail.com>

Also left some others that seemed used by applications other than ffserver

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-11 14:29:56 +02:00
James Almer
31b7ab9f06 lavf/mpegts: remove obsolete ff_mpegts_parse_* cruft 
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-11 13:46:53 +02:00
James Almer
59ecd4882d lavc/raw: remove obsolete ff_raw_pix_fmt_tags cruft 
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-11 13:46:23 +02:00
James Almer
8f2634f970 lavc: stop exporting internal functions and tables 
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-11 13:23:48 +02:00
Michael Niedermayer
9eda4e8bd7 avcodec/idctdsp: move add/put_pixels_clamped_c to header 
This allows sharing them with the xvid IDCT

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-11 13:08:46 +02:00
Christophe Gisquet
5ec85c9750 hevc: do generic validation of bitstream 
After finishing parsing VPS/SPS/PPS/slice header, check remaining bits,
and if an overconsumption occurred, report invalid data.

Liked-by: BBB
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-11 02:47:05 +02:00
Ronald S. Bultje
bfffce4d08 hevc: add missing comma in log message. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-11 02:27:27 +02:00
Michael Niedermayer
6801eb0a09 avcodec/vc1dec: do not crash when flushing without an allocated frame 
Fixes Ticket3837
Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-11 02:16:43 +02:00
Michael Niedermayer
f4e814f787 swresample: check av_opt_set for failure in swr_alloc_set_opts() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-11 01:34:34 +02:00
Luca Barbato
c4ac48c5a1 swresample: document the need to configure the context using AVOptions 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-11 00:35:56 +02:00
Michael Niedermayer
49456a95eb avformat/movenc: Fix printf type 
Found-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-11 00:09:09 +02:00
Michael Niedermayer
7727345613 Merge commit '08b94f160a2c966bb83e32bde0e52246fafa2155' 
* commit '08b94f160a2c966bb83e32bde0e52246fafa2155':
  configure: Don't pass MSVC compiler options -M[TD] to armasm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-10 23:47:48 +02:00
Michael Niedermayer
d177f27517 Merge commit 'cc1d8c54c19dd14fb851e3e7a7793d6b3bd75e94' 
* commit 'cc1d8c54c19dd14fb851e3e7a7793d6b3bd75e94':
  avcodec: Postpone FF_IDCT_XVIDMMX removal until the next version bump

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-10 23:41:51 +02:00
Carl Eugen Hoyos
788cf6f0c6 Remove panscan information in av_frame_copy_props() if resolution changes. 
Fixes ticket #3750.
 2014-08-10 22:31:33 +02:00
Michael Niedermayer
3539d6c63a avcodec/iff: check pixfmt for rgb8 / rgbn 
Fixes out of array access

Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-10 22:05:55 +02:00
Michael Niedermayer
9bcdb98839 avcodec/iff: Factorize av_pix_fmt_desc_get() out 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-10 21:53:39 +02:00
Mark Reid
cab39afb1a avformat/movenc: check that reel_name length doesn't exceed UINT16_MAX 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-10 21:32:05 +02:00
Michael Niedermayer
bd87965247 Merge commit 'd63443b9684fa7b3e086634f7b44b203b6d9221e' 
* commit 'd63443b9684fa7b3e086634f7b44b203b6d9221e':
  lavc: drop the av_fast_{re,m}alloc compatibility wrappers

Conflicts:
	libavcodec/utils.c

See: a973e01501
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-10 20:51:15 +02:00
Michael Niedermayer
d123d9abef Merge commit '8dca0877e3e1457e9ec79ffa1ead1135aabb791c' 
* commit '8dca0877e3e1457e9ec79ffa1ead1135aabb791c':
  mpegts: Return proper error code on invalid input data

Conflicts:
	libavformat/mpegtsenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-10 20:34:28 +02:00
Michael Niedermayer
c24be3c4a2 Merge commit '59cc0812207e3c2e2f2e559d60d0a8f9296a8847' 
* commit '59cc0812207e3c2e2f2e559d60d0a8f9296a8847':
  Prepare for 11_alpha2 Release

Conflicts:
	RELEASE

Not merged, as our release numbers differ

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-10 20:32:00 +02:00
Michael Niedermayer
3787495e1f Merge commit 'ab0742d2f34d70415620441b7ed7da2f03a0c14f' 
* commit 'ab0742d2f34d70415620441b7ed7da2f03a0c14f':
  configure: Suggest upgrading gas-preprocessor instead of just installing

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-10 20:31:14 +02:00
Martin Storsjö
08b94f160a configure: Don't pass MSVC compiler options -M[TD] to armasm 
The -MD option (for enabling a dynamically linked crt) gets interpreted
as a cpp option for generating dependency information (into a file named
'-.d', when preprocessing to a pipe). We shouldn't be passing
any and all C compiler flags to armasm (which is a plain assembler,
only with cpp bolted on via gas-preprocessor), but these are the
main conflicting ones.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-08-10 21:29:06 +03:00
Diego Biurrun
cc1d8c54c1 avcodec: Postpone FF_IDCT_XVIDMMX removal until the next version bump 2014-08-10 10:41:55 -07:00
Michael Niedermayer
7e4e45d227 Merge commit '9f8cf50e3be04b8e178086edaa4598826143303d' 
* commit '9f8cf50e3be04b8e178086edaa4598826143303d':
  configure: Enable gas-preprocessor on all OSes but only if available

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-10 19:16:42 +02:00
Michael Niedermayer
f51c3e3a84 Merge commit 'f4312352fc52cc47c1ba398a33f629d32a737e91' 
* commit 'f4312352fc52cc47c1ba398a33f629d32a737e91':
  configure: Add probe identification of MS armasm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-10 18:54:15 +02:00
Michael Niedermayer
d6efed84b1 Merge remote-tracking branch 'cehoyos/master' 
* cehoyos/master:
  lavf/img2dec: Initialize a stack variable.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-10 18:48:07 +02:00
Michael Niedermayer
61b9ce00a3 Merge commit '2597a842a0a2c7e8aa76f32733d27bf64817ae86' 
* commit '2597a842a0a2c7e8aa76f32733d27bf64817ae86':
  tiff: Improve grayscale support

Conflicts:
	libavcodec/tiff.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-10 18:40:46 +02:00
Michael Niedermayer
78eaaa857e Merge commit 'fb1ddcdc8f51b9d261ae8e9c26b91e81f7b6bf45' 
* commit 'fb1ddcdc8f51b9d261ae8e9c26b91e81f7b6bf45':
  avresample: Introduce AVFrame-based API

Conflicts:
	libavresample/utils.c
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-10 18:20:37 +02:00
Carl Eugen Hoyos
273fc0139e lavf/img2dec: Initialize a stack variable. 
Fixes a valgrind warning about using unitialised memory.
Hopefully fixes crashes on several platforms reported through fate.
 2014-08-10 18:20:12 +02:00
Christophe Gisquet
0d0d24af01 hevc_ps: verify P/T/L information 
This makes the SPS parsing a little, but barely, safer.

Reviewed-by: Mickaël Raulet <mraulet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-10 18:05:33 +02:00