dilim/FFmpeg
1
0 Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-11-06 05:17:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
58,068 Commits 41 Branches 434 Tags
release/2.1
Commit Graph
4049 Commits
Author SHA1 Message Date
Michael Niedermayer c77d226f71 avfilter/x86/vf_hqdn3d: Fix register types 
Fixes Ticket4301

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 52fc3e372f)
 2015-06-19 11:44:31 +02:00
Carl Eugen Hoyos 819889e737 lavfi/fade: Do not overread input buffer. 
(cherry picked from commit ab3ff19f08)
 2015-05-17 12:50:17 +02:00
Paul B Mahol ac1905cd5b lavfi: check av_strdup() return value 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
(cherry picked from commit 145a84717b)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-06 16:08:29 +01:00
Michael Niedermayer 19475c0d74 avfilter/vf_sab: fix filtering tiny images 
Fixes out of array reads

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 9bff052b51)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-05 05:12:34 +01:00
Michael Niedermayer 97ccf31ece avfilter/x86/vf_pullup: fix old typo 
This makes C and MMX match, no change to fate as the differences where
apparently not sufficient to show up in fate

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit b8255a4c70)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-25 18:26:28 +02:00
Michael Niedermayer 0f09436a43 avfilter/vf_pullup: use ptrdiff_t as stride argument for dsp functions 
This should avoid issues on x86_64

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 6dffc8f5aa)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-25 18:26:22 +02:00
Michael Niedermayer 2a543e58ec avfilter/graphdump: Fix pointer to local outside scope 
Fixes CID1194435
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 18af0ce62d)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-23 16:51:09 +02:00
Michael Niedermayer 9cde200ba7 avfilter/filtfmts: Support dynamically allocated in/outputs 
Fixes crash
Fixes Ticket3468

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 59c7615d58)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-23 16:51:08 +02:00
Michael Niedermayer 4eb0b6c590 avfilter/vf_deshake: fix loss of precission with odd resolutions 
Fixes part of Ticket3466
Found-by: Andrey_Karpov / PVS-Studio
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 73734282e0)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-23 16:51:08 +02:00
Michael Niedermayer 90a384cde1 avfilter/f_select: fix loss of precission in SAD calculation 
Fixes part of Ticket3466
Found-by: Andrey_Karpov / PVS-Studio
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 5a8ef3c66b)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-23 16:51:08 +02:00
Michael Niedermayer 4c9c76af85 avfilter/vf_pullup: fix gray8 
Fixes segfault
Fixes Ticket3469

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit e818ee090a)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-23 15:10:07 +02:00
Nicolas George 910fd77967 lavfi/af_atempo: clear references before returning error. 
Once the frame has been given to ff_filter_frame(), it can
no longer be used, even on error.

Fix trac ticket #3430.
(cherry picked from commit bc6901c949)
 2014-03-08 15:19:11 +01:00
Nicolas George fc5261c219 lavfi/dualinput: fix shortest option. 
Fix trac ticket #3315.
(cherry picked from commit 2dc5980d61)
 2014-01-20 22:28:01 +01:00
Michael Niedermayer cf6cf50ac6 do O(1) instead of O(n) atomic operations in register functions 
about 1ms faster startup time

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 133fbfc781)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-07 03:05:30 +01:00
Michael Niedermayer edc6f3da0e avfilter/vf_format: check that the format list is not empty 
Fixes Ticket3210

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit ee16e0cacc)
 2014-01-07 02:02:52 +01:00
Alexander Strasser 8c79730a8e configure: Special case libfreetype test 
Include the freetype header, in-directly through a macro, like it
is done in the drawtext filter. Do not break if the header is moved.

Unfortunately the drawtext filter included the file where the include
macros are defined in a wrong way. This is not needed and breaks the
build. Remove that #include line too.

(cherry picked from commit cea5812fa7)

Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
 2013-12-29 11:36:01 +01:00
Michael Niedermayer cbcc18bd9f avfilter/vf_pad: fix req_end 
Fixes out of array accesses
Fixes Ticket3190

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 0cc5011f9a)
 2013-12-03 09:52:23 +01:00
Nicolas George ad19cb3ca7 lavfi/af_pan: support unknown layouts on input. 
Fix trac ticket #2899.
(cherry picked from commit 7b0a587393)
 2013-11-28 01:05:33 +01:00
Nicolas George bc04a3a489 lavfi/af_pan: support unknown layouts on output. 
(cherry picked from commit 4e9adc9b73)
 2013-11-28 01:05:26 +01:00
Nicolas George 838a453e39 lavfi: parsing helper for unknown channel layouts. 
Make ff_parse_channel_layout() accept unknown layouts too.
(cherry picked from commit 6e2473edfd)
 2013-11-28 01:05:14 +01:00
Nicolas George 1a676881ca lavfi/avfiltergraph: do not reduce incompatible lists. 
A list of "all channel layouts" but not "all channel counts"
can not be reduced to a single unknown channel count.
(cherry picked from commit d300f5f6f5)
 2013-11-28 01:05:07 +01:00
Nicolas George c2ae9f75d7 lavfi/avfiltergraph: suggest a solution when format selection fails. 
Format selection can fail if unknown channel layouts are used
with filters that do not support it.
(cherry picked from commit f775eb3fb4)
 2013-11-28 01:05:01 +01:00
Paul B Mahol 75b2bbe21d libavfilter/vf_noise: relicense to LGPL 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-10-27 20:29:07 +00:00
Derek Buitenhuis 52aed19307 avfiltergraph: Properly handle memory allocation failure 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2013-10-27 19:15:03 +00:00
Paul B Mahol 292902ea9f avfilter: add mergeplanes filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-10-27 18:58:43 +00:00
Benedict Endemann 696aa74b1a lavfi/overlay: correct small error in intersection detection 
The image size of the destination image was used to determine if a source
image was positioned outside the destination image, that no intersection
could occur.  Actually for these two cases the size of the source image
has to be used!

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2013-10-27 15:01:02 +01:00
Michael Niedermayer a826efb55a avfilter/x86/vf_gradfun_init: fix const and related warnings 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-24 12:12:59 +02:00
Michael Niedermayer 1ea28ffc4d Merge commit '0e730494160d973400aed8d2addd1f58a0ec883e' 
* commit '0e730494160d973400aed8d2addd1f58a0ec883e':
  avfilter: x86: Port gradfun filter optimizations to yasm

Conflicts:
	libavfilter/x86/vf_gradfun_init.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-24 10:35:39 +02:00
Paul B Mahol 426abbb632 avfilter/libmpcodecs/vf_eq: remove useless storage class specifier in empty declaration 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-10-24 07:44:23 +00:00
Robert Krüger 83922cccb2 avfilter/vf_scale: Correct vf_scale mappings from arguments to color range 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-23 15:44:31 +02:00
Daniel Kang 0e73049416 avfilter: x86: Port gradfun filter optimizations to yasm 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-10-23 14:50:27 +02:00
Michael Niedermayer f4f8499c19 Merge commit 'f6633c55a3c0e93a5b2bab6aa0692fb608f2a38d' 
* commit 'f6633c55a3c0e93a5b2bab6aa0692fb608f2a38d':
  avfilter: Fix typo in Loren's email address

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-23 12:14:49 +02:00
Diego Biurrun f6633c55a3 avfilter: Fix typo in Loren's email address 2013-10-23 10:25:14 +02:00
Michael Niedermayer f94124c23e Merge commit '00d7369de06a16f7c8770a899fcb16bcb94b1e20' 
* commit '00d7369de06a16f7c8770a899fcb16bcb94b1e20':
  vf_fieldorder: log when processing is skipped

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-22 19:26:42 +02:00
Derek Buitenhuis 692b930904 lavfi/pthread: Avoid crashes/odd behavior caused by spurious wakeups 
This is similar to 5152196b2b.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2013-10-22 17:05:26 +01:00
Derek Buitenhuis 3511d4fc97 pthread: Avoid crashes/odd behavior caused by spurious wakeups 
This is similar to 5152196b2b.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2013-10-22 13:24:01 +01:00
Vittorio Giovara 00d7369de0 vf_fieldorder: log when processing is skipped 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2013-10-22 10:58:25 +02:00
Paul B Mahol c9660999b9 avfilter: replaygain scanner 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-10-21 19:56:55 +00:00
Michael Niedermayer ab2bfb85d4 avfilter/ff_insert_pad: fix order of operations 
Fixes out of bounds access
Fixes CID732170
Fixes CID732169

No filter is known to use this function in a way so the issue can be reproduced.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-21 16:43:25 +02:00
Michael Niedermayer d5ec8ba7f2 Do not leave positive values undefined when negative are defined as error 
Define positive return values as non errors and leave further meaning undefined
This allows future extensions to use these values

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-19 16:42:57 +02:00
Michael Niedermayer 005200887b Merge commit 'eb90a2091ffb94d8c29aaa5ff50f4192520254fc' 
* commit 'eb90a2091ffb94d8c29aaa5ff50f4192520254fc':
  pthread: Fix deadlock during thread initialization

Conflicts:
	libavcodec/pthread.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-14 00:04:52 +02:00
Derek Buitenhuis eb90a2091f pthread: Fix deadlock during thread initialization 
Sometimes, if pthread_create() failed, then pthread_cond_wait() could
accidentally be called in the worker threads after the uninit function
had already called pthread_cond_broadcast(), leading to a deadlock.

Don't call pthread_cond_wait() if c->done is set.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2013-10-13 05:50:00 -04:00
Paul B Mahol cfc9a4c732 avfilter/vsrc_testsrc: smpte(hd)bars: use yuv directly 
Also set color space.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-10-12 18:40:15 +00:00
Paul B Mahol 1d8ce109e9 avfilter/vf_separatefields: do not reset pts to 0 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-10-12 15:10:19 +00:00
Michael Niedermayer aeddc6e3a5 avfilter/lavfutils: fix memleak of avpacket 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-12 11:52:10 +02:00
Michael Niedermayer eedfee12c6 avfilter/vf_removelogo: fix pixel pointer so it points where its intended 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-12 11:36:55 +02:00
Michael Niedermayer 8c582d1b22 avfilter/vf_removelogo: fix offset for accessing pixels above and below 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-12 11:35:54 +02:00
Michael Niedermayer 8c0687abdf avfilter/vf_removelogo: use av_freep() for saftey 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-12 11:31:38 +02:00
Paul B Mahol d1d875d301 avfilter/vf_w3fdif: do not reset pts to 0 
Shamelessly stolen from yadif.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-10-10 15:08:55 +00:00
Michael Niedermayer 0f322feffd avfilter/buffersink: try to fix AV_NOPTS_VALUE 
no testcase available, just found this issue by reading the code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-09 16:33:18 +02:00