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
78,561 Commits 37 Branches 400 Tags 463 MiB
d07f6e5f1c
Commit Graph

78561 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andreas Cadhalpun
a32dbf2aed asfdec: break if EOF is reached after asf_read_packet_header 
asf_read_payload can unset eof_reached, so check it also before calling
that function.

This fixes infinite loops.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Alexandra Hájková <alexandra@khirnov.net>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2016-02-07 03:12:33 +01:00
Michael Niedermayer
9ee4c89348 avcodec/utils: Add AV_PIX_FMT_GBRAP16?E to avcodec_align_dimensions2() 
Found-by: kierank
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-02-07 01:13:36 +01:00
Michael Niedermayer
2272ab0e84 avformat/mp3enc: Assert that the header we assembled is valid 
Silences: CID1351343

The header is calculated by the code above the changed hunk, it is
thus asserted that the header is always correct.

Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-02-07 01:12:48 +01:00
Paul B Mahol
d12d48d0a8 avfilter: add streamselect and astreamselect filter 
Signed-off-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2016-02-06 23:52:09 +01:00
Andreas Cadhalpun
14bf59c1d5 build: use intermediate lcov coverage file 
Otherwise the 'lcov -q --remove' run fails with the following error:
lcov: ERROR: cannot write to coverage.info!

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
 2016-02-06 15:42:09 +01:00
Andreas Cadhalpun
bb7522ce67 build: fix lcov with src link 
When out-of-tree builds now use a relative path, the '-b' option of lcov
is not needed, so just pass the current directory to it in this case.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
 2016-02-06 15:30:25 +01:00
Andreas Cadhalpun
e740c3fb90 configure: fall back to using full path if src is a directory 
Or when building in-tree.
Also don't try to remove src on distclean in these cases.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
 2016-02-06 15:30:25 +01:00
Henrik Gramner
389b79842c msvc: Fix libx264 linking 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2016-02-06 13:56:39 +01:00
Vicente Jimenez Aguilar
f428893c17 doc: Improve the channelsplit example 
Expand LFE acronym (lfe.wav -> low_frecuency_effects.wav) as with others filenames

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2016-02-06 13:19:25 +01:00
Paul B Mahol
956fed377b cmdutils: realign for some additional filters with very long name 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2016-02-06 12:48:51 +01:00
Luca Barbato
a38a4f44b5 configure: Support MSYS2 mingw-w64 64bit 2016-02-06 12:07:47 +01:00
James Almer
8ae7447941 x86/dcadec: add ff_lfe_fir0_float_{sse,sse2,avx,fma3} 
Up to ~4 times faster on x86_64, ~8 times on x86_32 if compiling using x87 fp math.

Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
 2016-02-06 01:36:55 -03:00
James Almer
3e9b8ffc9b avcodec/dcadsp: rename lfe_fir_float functions 
Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
 2016-02-06 01:29:10 -03:00
Timothy Gu
9fd6ea933f dirac_dwt: Make x86 files/functions names consistent 2016-02-05 19:30:23 -08:00
Timothy Gu
17ab8f7e68 diracdsp: Make x86 files/functions names consistent 2016-02-05 19:29:43 -08:00
Michael Bradshaw
1c40bccc09 lavc/dirac_dwt: fix building without asm 
clang needs HAVE_MMX to be first in order to avoid an undefined
reference error.
 2016-02-06 01:14:19 +01:00
Henrik Gramner
aa751573fe avcodec/h264: Fix segfault in 4:2:2 chroma deblock with 32-bit msvc 
Using rNm and x86inc's stack allocation with a negative value at the same
time isn't supported, and caused the original stack pointer to be clobbered
when using a compiler that doesn't support stack alignment.
 2016-02-05 22:01:38 +01:00
Marton Balint
6d14e32555 lavf/asfenc: add support for setting packet size 
This can provide a manual workaround for ticket #4230.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Marton Balint <cus@passwd.hu>
 2016-02-05 21:32:14 +01:00
Marton Balint
22bbd6e8b7 lavf/asfenc: add support for storing creation time 
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Marton Balint <cus@passwd.hu>
 2016-02-05 21:32:14 +01:00
Marton Balint
79e4293613 lavf/asfenc: add support for storing languages 
Checked compatiblity with VLC, Windows Media Player 12 and Windows Media ASF
Viewer 9 series.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Marton Balint <cus@passwd.hu>
 2016-02-05 21:32:14 +01:00
Marton Balint
0464767301 lavf/asfenc: check the number of streams in header 
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Marton Balint <cus@passwd.hu>
 2016-02-05 21:32:14 +01:00
Marton Balint
7e6b788f7c lavf/asfenc: add AVClass to context 
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Marton Balint <cus@passwd.hu>
 2016-02-05 21:32:14 +01:00
Paul B Mahol
b1fe794033 avfilter/split: support any channel count for asplit filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2016-02-05 21:05:47 +01:00
James Darnley
7042a55c55 avcodec/h264: mmxext 4:2:2 chroma deblock/loop filter 
2.6 times faster (366 vs. 142 cycles)
 2016-02-05 17:26:04 +01:00
Mats Peterson
9556446623 lavc/rawdec: Use 16-byte line alignment for B1W0 and B0W1 video in nut 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-02-05 15:40:49 +01:00
James Almer
16af350ac5 avcodec/dcadsp: replace intptr_t with ptrdiff_t 
Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
 2016-02-05 11:17:04 -03:00
Trevor \\\\ Higgins
6632802aa0 x11grab: fixed next frame capture time calculation 
The next frame time could slip, causing the frame rate to drop until
 frames were dropped. Now will capture at the next correct moment instead.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-02-05 01:11:17 +01:00
Eran Kornblau
1bbfaba196 avformat/mov: dont print frma warning when format is the same 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-02-05 01:11:04 +01:00
Michael Niedermayer
1693336aed avfilter/af_apulsator: assert that pathes leaving uninitialized variables do not occur 
Fixes: CID1341581, CID1341582

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-02-04 23:14:02 +01:00
James Almer
4c573f8ce9 fate: fix fate-aac-pns-encode failures on non-sse x86_32 targets 
Reviewed-by: Rostislav Pehlivanov <atomnuker@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
 2016-02-04 14:53:31 -03:00
Paul B Mahol
f862ff750b avfilter/vf_stack: free input pads name on uninit 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2016-02-04 18:02:29 +01:00
Carl Eugen Hoyos
a36c737490 lavf/isom: Add more code points for H264. 
Defined by the MP4 registration authority.
Fixes ticket #5217.
 2016-02-04 17:40:06 +01:00
Michael Niedermayer
f89bc661b4 avfilter/af_afftfilt: Set last_expr to the default 
This fixes a null pointer dereferece
Fixes: CID1351346

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-02-04 15:13:39 +01:00
Hendrik Leppkes
a969a914f5 dca_parser: ensure frame duration matches the actual sample rate 
The parser only parses the core, and thus has a duration relative
to the core sample rate only, not the actual stream sample rate.

FATE references changed due to now correct timestamps.
 2016-02-04 12:16:19 +01:00
James Almer
b3b0ecee15 x86/emms: empty the mmx state unconditionally on supported targets 
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
 2016-02-04 01:49:01 -03:00
Michael Niedermayer
37db3e8931 avcodec/libutvideoenc: Add NULL termintor to options 
Fixes segfaults

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-02-04 02:17:57 +01:00
Michael Niedermayer
61ea7f1509 swscale/swscale-test: Check av_image_fill_linesizes() for failure 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-02-04 01:49:38 +01:00
James Almer
0711c5bfb8 avutil/aes_crt: free AVAESCTR struct properly 
Reviewed-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
 2016-02-03 19:33:23 -03:00
Derek Buitenhuis
c4ef6c883b mjpegenc: Remove duplicate initializer 
This was causing c99conv to crash.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-02-03 22:14:27 +00:00
Derek Buitenhuis
0ea716f70b libutvideo: Unbreak 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-02-03 19:27:24 +00:00
Rostislav Pehlivanov
f021030365 diradec: split tables away to a separate diractab file 
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
 2016-02-03 17:19:33 +00:00
Rostislav Pehlivanov
3bbe7862ec diracdec: move the MAX_DWT_LEVELS macro to dirac.h 
Used by the VC-2 encoder.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
 2016-02-03 17:19:30 +00:00
Derek Buitenhuis
0627826523 Merge commit '68395f8c99393c281a08139d20a7a04398b2fd04' 
* commit '68395f8c99393c281a08139d20a7a04398b2fd04':
  qsvenc: fix a typo

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-02-03 17:13:56 +00:00
Derek Buitenhuis
4736f8115b Merge commit 'cc602061ee860b041013397e27a036b85cd87b09' 
* commit 'cc602061ee860b041013397e27a036b85cd87b09':
  x86inc: Add debug symbols indicating sizes of compiled functions

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-02-03 17:12:32 +00:00
Derek Buitenhuis
9de85c544a Merge commit '002c47798da0c43a053822c8041144798d49ed84' 
This is a NOOP.

* commit '002c47798da0c43a053822c8041144798d49ed84':
  x86inc: Avoid creating unnecessary local labels
  x86inc: Simplify AUTO_REP_RET
  x86inc: Use more consistent indentation
  x86inc: Preserve arguments when allocating stack space
  x86inc: Improve FMA instruction handling
  x86inc: Be more verbose in assertion failures
  x86inc: Make cpuflag() and notcpuflag() return 0 or 1

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-02-03 17:07:47 +00:00
Derek Buitenhuis
74f5cb0189 Merge commit 'd336bfcf69fee159e9dba5e5e486ddb1aba61aab' 
* commit 'd336bfcf69fee159e9dba5e5e486ddb1aba61aab':
  pixdesc: fix and extend doxy for av_pix_fmt_get_chroma_sub_sample()

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-02-03 16:59:06 +00:00
Derek Buitenhuis
27acb64a53 Merge commit 'c0c4d7a0a556ec66e3068d36a883e84d1efb0690' 
* commit 'c0c4d7a0a556ec66e3068d36a883e84d1efb0690':
  configure: Correctly add openssl cflags and libs

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-02-03 16:57:46 +00:00
Derek Buitenhuis
2880e6810c Merge commit '87a814fdce522d45aa31aa258cb5514d7e754bff' 
* commit '87a814fdce522d45aa31aa258cb5514d7e754bff':
  libavcodec: Add missing AVClass pointers

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-02-03 16:57:07 +00:00
Derek Buitenhuis
730d2aabac Merge commit '0e9c4fe254073b209970df3e3cb84531bc388e99' 
* commit '0e9c4fe254073b209970df3e3cb84531bc388e99':
  lavc: Move pre_me to codec private options

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-02-03 16:54:20 +00:00
Derek Buitenhuis
43c0298208 Merge commit '5b6f42da98c26a8aee8d2c2edfcbd0633ad1c607' 
* commit '5b6f42da98c26a8aee8d2c2edfcbd0633ad1c607':
  lavc: Move me_penalty_compensation to codec private options

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-02-03 16:53:13 +00:00