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
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
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
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
aeddc6e3a5
avfilter/lavfutils: fix memleak of avpacket
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-10-12 11:52:10 +02:00
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
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
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
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
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
8780f7fbfa
avfilter/ff_filter_frame_needs_framing: fix handling of AV_NOPTS_VALUE
...
Fixes Ticket3015
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-10-09 16:33:18 +02:00
162e22e144
avfilter/af_join: remove now unnecessary goto
...
Options are freed from the generic code now, there is no need to call
av_opt_free() from the filter.
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2013-10-08 12:40:33 +00:00
728bb910ec
avfilter/vf_deshake: fix block_contrast() lower brightness value
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-10-07 22:05:14 +02:00
2779b7b30a
avfilter/deshake
...
The old row index looks weird and wrong to me
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-10-07 21:39:16 +02:00
b8866783c6
avfilter/lswsutils: dont override the default scaler
...
This should make no difference as this code is only used by removelogo which
seems to refuse to use masks of different size.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-10-07 13:28:13 +02:00
ad934bc353
avfilter/vf_drawtext: remove dead initialization
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2013-10-07 08:40:17 +00:00
ce26a016cd
avfilter/vf_phase: remove dead initialization
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2013-10-07 08:28:00 +00:00
3ee796760a
avfilter/vf_scale: dont duplicate default.
...
use the defaults set by swscale
Suggested-by: stefano
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-10-06 12:39:47 +02:00
931a4b433d
avfilter/vf_scale: change the default scaler to bicubic
...
See: [FFmpeg-devel] [PATCH] swscale/options: switch default to bicubic
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-10-06 11:00:48 +02:00
746e3142ee
avfilter/f_interleave: use the name 's' for the pointer to the private context
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2013-10-05 19:16:55 +00:00
9665217a75
avfilter/af_silencedetect: support more sample formats
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2013-10-05 11:59:34 +00:00
a2c14ba2b1
avfilter/vf_histogram: use const for variables that are not supposed to change
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2013-10-04 16:48:19 +00:00
02a6ee5168
avfilter/vf_frei0r: fix out of array read
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-10-04 11:16:35 +02:00
5f99e6d632
avfilter/vf_pullup: do not ignore frame field order
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2013-10-03 02:43:20 +00:00
0362cf1a19
avfilter/vf_histogram: add mirrored waveform mode
...
Added parameter to mirror the waveform (high values are shown on top in column mode)
Signed-off-by: Marton Balint <cus@passwd.hu >
2013-10-02 21:02:59 +00:00
5b5bb0d81c
avfilter/vf_histogram: fix segfault in parade waveform mode for subsampled formats
...
Signed-off-by: Marton Balint <cus@passwd.hu >
2013-10-02 21:02:54 +00:00
c4f3b55f50
Merge commit '06e7301a2efa8dededecbe6836ee5b59bf7e5e76'
...
* commit '06e7301a2efa8dededecbe6836ee5b59bf7e5e76':
vf_interlace: do not process an already interlaced frame
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-10-03 11:16:57 +02:00
06e7301a2e
vf_interlace: do not process an already interlaced frame
...
Signed-off-by: Anton Khirnov <anton@khirnov.net >
2013-10-02 16:40:49 +02:00
3841e4510b
avfilter/avf_showspectrum: use the name 's' for the pointer to the private context
2013-10-02 11:37:53 +00:00
848a1e6738
avfilter/af_afade: use the name 's' for the pointer to the private context
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2013-10-02 11:37:52 +00:00
e31a239fea
avfilter/vf_removelogo: use the name 's' for the pointer to the private context
2013-10-02 10:54:11 +00:00
7d0ce1e59d
avfilter/af_silencedetect: use the name 's' for the pointer to the private context
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2013-10-02 10:28:28 +00:00
edadda968c
avfilter/vf_histogram: change order of histograms for planar rgb
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2013-10-01 21:22:22 +00:00
cac9af68a4
avfilter/vf_histogram: add support for subsampled planar yuv modes in waveform mode
...
Signed-off-by: Marton Balint <cus@passwd.hu >
2013-10-01 21:04:31 +00:00
31a8461d64
avfilter/vf_histogram: improve waveform speed
...
Signed-off-by: Marton Balint <cus@passwd.hu >
2013-10-01 21:04:30 +00:00
0a4aea6db9
avfilter/vf_hflip: support slice threading
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2013-09-30 13:08:55 +00:00
2a6a3d4317
avfilter/vf_hflip: refactor plane dimensions calculation
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2013-09-30 13:08:55 +00:00
862773907a
avfilter/vf_rotate: support slice threading
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2013-09-30 13:08:55 +00:00
cd1b22d8e8
avfilter/dualinput: simplify
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2013-09-30 08:47:40 +00:00
61274193e3
avfilter/vf_rotate: use vsub for output plane height calculation
...
Output plane height used horizontal instead of vertical subsampling.
This is just cosmetic change as filter does not support formats where
vertical subsampling does not match horizontal one.
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2013-09-29 19:24:27 +00:00
88c8ed18c9
avfilter/dualinput: remove unused variable
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2013-09-28 14:33:30 +00:00
7381d31f22
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
lavfi: allow user-provided execute() callbacks
Conflicts:
libavfilter/avfilter.h
libavfilter/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-09-28 11:02:01 +02:00
0767bfd199
lavfi: allow user-provided execute() callbacks
2013-09-28 08:06:19 +02:00
b890198b66
avfilter: add av_cold to init()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2013-09-27 18:51:49 +00:00
e064d0aaf6
avfilter/vidstabtransform: update optzoom range values for recent vid.stab update.
...
Signed-off-by: Georg Martius <martius@mis.mpg.de >
2013-09-27 16:48:31 +00:00
191ee4aefb
avfilter/af_ladspa: set output channel layout for passthrough case
...
For cases when plugin does not return any samples we just return
input samples. Previously channel layout for outlink was not set.
Set it explicitly instead.
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2013-09-27 12:51:08 +00:00
110a2f446d
avfilter/af_ladspa: allow changing controls dynamically
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2013-09-27 12:49:55 +00:00
4d86a945df
avfilter/af_ladspa: refactor code setting input control ports values
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2013-09-27 12:49:54 +00:00
231e50157c
lavfi/dualinput: reimplement on top of framesync.
2013-09-23 09:50:09 +02:00
53319d5c93
lavfi: add an API to synchronize multiple video inputs.
...
Compared to dualinput, this API can handle more than two
inputs and can generate frames synchronized to any or all
input streams.
2013-09-23 09:49:37 +02:00
