Michael Niedermayer
867c02acd2
avfilter/avf_showcqt: avoid using fminf()
...
The loop with fminf() changes from 18093856 to 17403218 dezicycles (gcc 4.6.3, sandybridge i7)
Reviewed-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-06 17:20:05 +02:00
Muhammad Faiz
40e938a7ed
avfilter: new multimedia filter avf_showcqt.c
...
this filter is the same as showspectrum but with constant Q transform,
so frequency is spaced logarithmically
2014-06-05 14:04:01 +02:00
Tobias Rapp
d76f0c0378
avfilter/bufferqueue: Increase buffer queue size
...
Avoid buffer overruns when processing some MOV files with the amerge
filter. Files produced by Adobe Premiere Pro CC have up to one second of audio
not interleaved. With common settings (<= 48kHz) that makes up to 47 frames so
a queue length of 64 makes sense.
Fixes ticket #3510 .
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-04 18:41:04 +02:00
Lou Logan
88f2586adb
fix various typos
...
Signed-off-by: Lou Logan <lou@lrcd.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-03 10:58:19 -08:00
Michael Niedermayer
20343cfb51
Merge commit 'ad0fe2f4012031c47268f14b9835088c488e1998'
...
* commit 'ad0fe2f4012031c47268f14b9835088c488e1998':
af_resample: Use avresample_get_out_samples
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-29 01:24:48 +02:00
Luca Barbato
ad0fe2f401
af_resample: Use avresample_get_out_samples
2014-05-28 22:50:55 +02:00
Michael Niedermayer
1853e2cba9
avfilter/formats: Avoid using non public AV_SAMPLE_FMT_NB
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-27 18:22:09 +02:00
Michael Niedermayer
0d26264fb4
avfilter/vf_drawtext: Avoid using non public AV_PIX_FMT_NB
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-27 17:52:24 +02:00
Michael Niedermayer
ee0c91cc65
avfilter/vf_telecine: Avoid using non public AV_PIX_FMT_NB
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-27 17:45:36 +02:00
Michael Niedermayer
515e8aed03
avfilter/vf_transpose: Avoid using non public AV_PIX_FMT_NB
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-27 17:45:21 +02:00
Michael Niedermayer
e10ac3a12e
avfilter/vf_swapuv: Avoid using non public AV_PIX_FMT_NB
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-27 17:45:07 +02:00
Michael Niedermayer
cfa0ad6eec
avfilter/vf_noise: Avoid using non public AV_PIX_FMT_NB
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-27 17:44:45 +02:00
Michael Niedermayer
1dbc98461b
avfilter/vf_mergeplanes: Avoid using non public AV_PIX_FMT_NB
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-27 17:44:15 +02:00
Michael Niedermayer
c0f8801e47
avfilter/il: Avoid using non public AV_PIX_FMT_NB
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-27 17:44:02 +02:00
Michael Niedermayer
5feac96fdb
avfilter/hflip: Avoid using non public AV_PIX_FMT_NB
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-27 17:43:46 +02:00
Michael Niedermayer
f3fdc32e2f
avfilter/crop: Avoid using non public AV_PIX_FMT_NB
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-27 17:43:32 +02:00
Michael Niedermayer
64fb19cc99
avfilter/formats: Avoid using non public AV_PIX_FMT_NB
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-27 17:43:03 +02:00
Michael Niedermayer
a1cb4efd2f
Merge commit '7cc4c9f32f446feaec5447e3d097e8147e35f156'
...
* commit '7cc4c9f32f446feaec5447e3d097e8147e35f156':
lavfi/formats: avoid using AV_{PIX,SAMPLE}_FMT_NB
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-27 03:23:23 +02:00
Michael Niedermayer
cdf6a9441d
Merge commit 'a7d070acb55c3ebbdd5e93e3366f32865732b8a3'
...
* commit 'a7d070acb55c3ebbdd5e93e3366f32865732b8a3':
vf_fieldorder: avoid using AV_PIX_FMT_NB
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-27 03:02:37 +02:00
Michael Niedermayer
de5ec08825
Merge commit '862f33c10ea38ea49fa4188725df5e5246dbd1d8'
...
* commit '862f33c10ea38ea49fa4188725df5e5246dbd1d8':
vf_scale: use the pixfmt descriptor API
Conflicts:
libavfilter/vf_scale.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-27 02:54:58 +02:00
Michael Niedermayer
a37f2cc579
avfilter/vf_format: fix duplicate ;
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-27 02:53:17 +02:00
Michael Niedermayer
6e9dbee7c6
Merge commit '45fc73edfe071f9690e8671ed2dc402b1cb02ece'
...
* commit '45fc73edfe071f9690e8671ed2dc402b1cb02ece':
vf_format: rework format list parsing
Conflicts:
libavfilter/vf_format.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-27 02:46:56 +02:00
Anton Khirnov
7cc4c9f32f
lavfi/formats: avoid using AV_{PIX,SAMPLE}_FMT_NB
...
Thatt hardcodes the number of formats into lavfi and will break when a
shared lavu is updated, adding new formats.
2014-05-26 22:25:47 +02:00
Anton Khirnov
b03b2d86aa
buffersrc: avoid using AV_PIX_FMT_NB
...
That hardcodes the number of pixel formats into lavfi and will break
when a shared lavu is updated, adding new pixel formats.
2014-05-26 22:25:41 +02:00
Anton Khirnov
a7d070acb5
vf_fieldorder: avoid using AV_PIX_FMT_NB
...
That hardcodes the number of pixel formats into lavfi and will break
when a shared lavu is updated, adding new pixel formats.
2014-05-26 22:25:26 +02:00
Anton Khirnov
862f33c10e
vf_scale: use the pixfmt descriptor API
...
Avoid using AV_PIX_FMT_NB, since that hardcodes the number of pixel
formats into lavfi and will break when a shared lavu is updated, adding
new pixel formats.
2014-05-26 22:24:46 +02:00
Anton Khirnov
45fc73edfe
vf_format: rework format list parsing
...
Avoid using AV_PIX_FMT_NB, since that hardcodes the number of pixel
formats into lavfi and will break when a shared lavu is updated, adding
new pixel formats.
2014-05-26 22:22:42 +02:00
Billy Shambrook
308188be34
Add metadata injection to blackdetect
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-24 03:56:42 +02:00
Lukasz Marek
ce051ceefc
lavfi/vf_fps: use av_fifo_alloc_array
...
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
2014-05-20 00:00:44 +02:00
Lukasz Marek
d15db8e413
lavfi/buffersink: use av_fifo_alloc_array
...
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
2014-05-20 00:00:44 +02:00
Clément Bœsch
11e490334e
avfilter/edgedetect: reuse already defined ctx.
2014-05-17 14:16:04 +02:00
Clément Bœsch
bac08cf086
avfilter/vignette: reindent after previous commit.
2014-05-16 06:53:36 +02:00
Clément Bœsch
ed7bc5471b
avfilter/vignette: add direct rendering.
2014-05-16 06:53:18 +02:00
Clément Bœsch
8a0ba44e1a
vignette: reuse already declared ctx.
2014-05-16 06:48:41 +02:00
Masa Utashiro
491d602283
avfilter/vignette: fix input frame memory leak.
...
Fixes Ticket #3642 .
2014-05-16 06:32:26 +02:00
Michael Niedermayer
3af7e7b501
avfilter/vsrc_mandelbrot: use av_malloc_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-15 01:54:36 +02:00
Clément Bœsch
bc2e39c4cc
avfilter/lut3d: move the scale calc out of the inner loop.
2014-05-14 07:51:10 +02:00
Michael Niedermayer
6ab37221c8
avfilter/vf_removelogo: use av_malloc_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-14 06:17:27 +02:00
Michael Niedermayer
14e2e40f3b
avfilter/vf_hqdn3: use av_malloc_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-14 06:17:05 +02:00
Clément Bœsch
c683e6aa2c
build: move ebur128 swr dep to configure.
2014-05-13 23:13:44 +02:00
Michael Niedermayer
3d7218d932
Merge commit '449511740f06a4675b0066730fa45cdb764ffafc'
...
* commit '449511740f06a4675b0066730fa45cdb764ffafc':
build: handle library dependencies in configure
Conflicts:
common.mak
configure
libavdevice/Makefile
libavfilter/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-13 22:40:32 +02:00
Janne Grunau
449511740f
build: handle library dependencies in configure
...
Instead of setting FFLIBS in each library Makefile configure
exports FFLIBS-$library in config.mak.
2014-05-13 20:02:01 +02:00
Michael Niedermayer
b9cce9ee5c
avfilter/buffer: Use av_malloc_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-12 12:24:41 +02:00
Michael Niedermayer
e951e04a4a
avcodec/buffersrc: use av_mallocz_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-12 12:24:25 +02:00
michael
04e140daa2
libmpcodecs/vf_uspp: check avcodec_open() return code
...
Fixes CID1135747
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-11 02:13:28 +02:00
Michael Niedermayer
6b9e0bf42f
avfilter/vf_removelogo: fix memleak on failure
...
Fixes CID751770
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-10 21:29:24 +02:00
Michael Niedermayer
2e55f3e907
avfilter/vf_lut3d: check size in parse_dat()
...
Fixes CID1212261
Reviewed-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-10 14:46:58 +02:00
Matt Oliver
3554c2fafc
libmpcodecs: Fix compilation due to missing static in suncc.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-09 18:33:55 +02:00
Clément Bœsch
5623a10526
avfilter/phase: make the main loop readable.
2014-05-08 23:58:34 +02:00
Clément Bœsch
5df10150d4
avfilter/phase: add some constness for RO data pointers.
2014-05-08 23:34:51 +02:00
Clément Bœsch
69d72140ac
avfilter/phase: add timeline support.
2014-05-08 23:34:51 +02:00
Clément Bœsch
8de600de55
avfilter/phase: avoid a memcpy per frame.
2014-05-08 22:59:47 +02:00
Clément Bœsch
687119aa9d
avfilter/phase: do not pass the whole context to analyze_plane().
...
Also make sure the AVFilterContext is only being used for logging by
changing the type to void*
2014-05-08 22:59:47 +02:00
Clément Bœsch
362ab940fc
avfilter/phase: add comment on the context cached frame.
2014-05-08 22:59:47 +02:00
Michael Niedermayer
6c23a85000
avfilter/af_compand: Silence "may be used uninitialized" warning
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-08 06:53:16 +02:00
Lukasz Marek
70b63419ee
lavfi: use av_fifo_freep
...
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
2014-05-07 23:39:47 +02:00
Michael Niedermayer
efbf107f5b
avfilter/aeval: silence "may be used uninitialized" warning
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-07 16:15:50 +02:00
Michael Niedermayer
5fc4c00972
avfilter/af_bs2b: Fix incompatible pointer type warnings
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-06 01:01:02 +02:00
Michael Niedermayer
6bd1741231
avfilter/f_select: fix incompatible pointer type warning
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-05 05:51:50 +02:00
Clément Bœsch
7c3941b25c
avfilter/lut3d: support 3DLUTSIZE directive for Davinci files.
...
Fixes Ticket #2847 .
2014-05-04 10:36:53 +02:00
Michael Niedermayer
6b79ef00fd
avfilter/vf_deshake: dont pass the wrong context into the SAD functions
...
This fixes pointer type warnings
The context should have been unused so this should not fix any real bug
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-03 22:52:17 +02:00
Michael Niedermayer
00948ff876
avfilter/audio: use av_mallocz_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-03 20:08:18 +02:00
Clément Bœsch
d53e87a837
avfilter/edgedetect: update copyright.
2014-05-03 19:10:28 +02:00
Clément Bœsch
365c79bd4e
avfilter/edgedetect: reindent after previous commit.
2014-05-03 19:07:14 +02:00
Clément Bœsch
b17e98ded0
avfilter/edgedetect: add a colormix mode.
2014-05-03 19:07:14 +02:00
Clément Bœsch
3f3c3318be
avfilter/edgedetect: make processing functions context free.
2014-05-03 18:11:02 +02:00
Carl Eugen Hoyos
4aea0afbbb
Remove two duplicated named asm constraints.
...
This fixes compilation of libmpcodecs/vf_fspp.c with gcc and
INLINE_ASM_DIRECT_SYMBOL_REFS disabled.
2014-05-03 17:00:18 +02:00
Michael Niedermayer
681e008d06
vfilter/vf_yadif: fix request_frame after 0f9f24c9
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-03 16:14:32 +02:00
Michael Niedermayer
09725c1d2b
avfilter/vf_showinfo: also calculate and show mean and standard deviation
...
Fixes Ticket3013
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-03 06:02:42 +02:00
mplayer developers
80dd0aff33
libavfilter/libmpcodecs: sync existing filters with mplayer HEAD (ebcacb8b3ca91ef90acb93785b62fd8c5e5dae41)
...
Authors from svn:
cehoyos (2):
Support playback of JPEG 2000 digital cinema files.
Add name for image format IMGFMT_440P.
ib (1):
Get rid of VOCTRL_GUI_NOWINDOW.
Matt Oliver (4):
Fix libmpcodecs inline asm on ICL.
Use DECLARE_ALIGNED helper macros.
Remove some superfluous commas from inline asm for better compatibility.
Use numeric labels in inline asm for consistency and better compatibility.
reimar (10):
Fix bpp calculation for XYZ format.
Avoid duplicating the mouse autohide code.
Add NV12/NV21 support to some helper functions.
Add support for rotating the video via OpenGL.
Add options to determine where borders will be added when adjusting for aspect.
Apply forgotten move of apply_border_pos function.
Extract window creation code to common file.
Make VDPAU support work again with latest FFmpeg.
img_format: document why mp_get_chroma_shift does not work for NV12/NV21
Minor spelling/grammar fixes.
For detailed line by line authorship please see svn log of mplayer
svn://svn.mplayerhq.hu/mplayer/trunk
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-03 02:37:27 +02:00
Michael Niedermayer
0f9f24c9cf
avfilter/vf_yadif: fix filtering a single image
...
Found-by: wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-02 02:33:24 +02:00
Michael Niedermayer
154d80eae7
Merge commit '1c0210c7981b6a61043d9171f506b435ff5a1f5e'
...
* commit '1c0210c7981b6a61043d9171f506b435ff5a1f5e':
lavfi: add Bauer stereo-to-binaural audio filter
Conflicts:
Changelog
configure
doc/filters.texi
libavfilter/Makefile
libavfilter/allfilters.c
libavfilter/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-01 14:14:10 +02:00
ValdikSS
7a0e689c45
lavfi/subtitles: introduce stream_index
...
Signed-off-by: ValdikSS <iam@valdikss.org.ru>
2014-05-01 12:52:33 +02:00
Alessandro Ghedini
1c0210c798
lavfi: add Bauer stereo-to-binaural audio filter
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2014-05-01 08:00:30 +02:00
Michael Niedermayer
617e866e25
Move av_find_best_pix_fmt_of_2() from avcodec to avutil
...
This avoids a dependancy of libavfilter on libavcodec
See Ticket 3592
Fixes Ticket2784
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-30 23:14:05 +02:00
Nicolas George
41334fcab4
lavfi/drawtext: allow to format pts as HH:MM:SS.mmm.
2014-04-29 13:25:59 +02:00
Michael Niedermayer
18af0ce62d
avfilter/graphdump: Fix pointer to local outside scope
...
Fixes CID1194435
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-28 04:01:50 +02:00
Clément Bœsch
b2cfd1fde7
avfilter/curves: fix resource leaks.
...
Fixes CID1206650
2014-04-27 11:49:13 +02:00
Michael Niedermayer
6956b048d8
avfilter/vf_drawtext: fix resource leaks
...
Fixes CID1206649
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-27 03:18:57 +02:00
Lukasz Marek
b217dc91bf
lavfi/avfilter: clarify avfilter_graph_get_filter() doxygen
...
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-26 02:16:56 +02:00
Lukasz Marek
b2682db34c
lavfi/avfilter: fix typos in doxgens
...
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-25 23:49:11 +02:00
Carl Eugen Hoyos
9cc4bc973c
Fix vf_eq.c and vf_eq2.c compilation with !HAVE_6REGS.
2014-04-24 17:50:27 +02:00
Michael Niedermayer
2c4862e7a1
avfilter/avcodec: Use av_mallocz_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-23 21:13:53 +02:00
Michael Niedermayer
658f5d1f63
avfilter/pthread: Use av_mallocz_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-22 02:40:20 +02:00
Michael Niedermayer
59c7615d58
avfilter/filtfmts: Support dynamically allocated in/outputs
...
Fixes crash
Fixes Ticket3468
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-21 11:33:17 +02:00
Michael Niedermayer
6ca0a976b2
Merge commit 'd23fc8846d255e31896453136b4c77bc6d5e873f'
...
* commit 'd23fc8846d255e31896453136b4c77bc6d5e873f':
filtfmts: remove unused lavf include
A include for channel_layout.h, is added otherwise compile would break
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-19 18:30:37 +02:00
Michael Niedermayer
74a8dbe1c4
Merge commit '58400ac133bcfb6bf8196b4e5208bc178307739b'
...
* commit '58400ac133bcfb6bf8196b4e5208bc178307739b':
lavfi: name anonymous structs
Conflicts:
libavfilter/buffersink.c
libavfilter/f_select.c
libavfilter/src_movie.c
libavfilter/vf_drawbox.c
libavfilter/vf_drawtext.c
libavfilter/vf_overlay.c
libavfilter/vf_showinfo.c
libavfilter/vf_unsharp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-19 18:20:17 +02:00
Vittorio Giovara
d23fc8846d
filtfmts: remove unused lavf include
2014-04-19 16:20:57 +02:00
Vittorio Giovara
58400ac133
lavfi: name anonymous structs
2014-04-19 16:20:57 +02:00
Carl Eugen Hoyos
b38910c979
Fix compilation with !HAVE_6REGS.
...
Can be tested with:
$ ./configure --cc='cc -m32' --disable-optimizations --enable-pic
2014-04-19 09:56:01 +02:00
Michael Niedermayer
d340dabb76
avfilter/vf_rotate: make int*90° rotates suck less speedwise
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-19 01:23:23 +02:00
Michael Niedermayer
c9aab1ee7f
avfilter/vf_rotate: fix several of by 1 errors
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-19 01:23:14 +02:00
Michael Niedermayer
4ebfb2c5ec
avfilter/vf_rotate: fix location of update operation
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-19 01:22:42 +02:00
Michael Niedermayer
a47cc877a0
avfilter/vf_rotate: increase fixed point precision
...
This ensures int_sins output doesnt have "random" lsbs
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-19 01:22:06 +02:00
Michael Niedermayer
443261cbbd
Merge commit 'f1b239ec8b38474d31f3bfea1f0b1693774fa432'
...
* commit 'f1b239ec8b38474d31f3bfea1f0b1693774fa432':
drawtext: Add fontconfig support
Conflicts:
configure
doc/filters.texi
libavfilter/vf_drawtext.c
See: 40b7a27bad
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-17 05:15:26 +02:00
Luca Barbato
f1b239ec8b
drawtext: Add fontconfig support
...
Introduce the `font` option and make it optional to pass a fontfile.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2014-04-17 00:41:30 +02:00
Michael Niedermayer
7999b41d48
avfilter/vf_pixdesctest: use av_malloc_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-16 19:44:23 +02:00
Michael Niedermayer
73734282e0
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>
2014-04-16 03:44:57 +02:00
Michael Niedermayer
5a8ef3c66b
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>
2014-04-16 03:44:57 +02:00
Michael Niedermayer
878f8b0d26
Merge commit 'aaab192df24a90f4450285cfb73b395cf495b462'
...
* commit 'aaab192df24a90f4450285cfb73b395cf495b462':
af_volume: implement replaygain clipping prevention
Conflicts:
doc/filters.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-13 14:39:51 +02:00
Facundo Gaich
7e6b3ad693
lavfi/subtitles: load attached fonts to libass.
...
Videos with complex typesetting usually have font files embedded
as attachment streams. vf_subtitles now finds all attachment
streams with a MIME type associated with fonts and loads them
to libass so it can use them for rendering.
The code was basically ported from mpv's loadfile.c@929793be7
Signed-off-by: Facundo Gaich <facugaich@gmail.com>
2014-04-13 12:06:24 +02:00
Alessandro Ghedini
aaab192df2
af_volume: implement replaygain clipping prevention
...
This adds a new "replaygain_noclip" option to the filter, and, if enabled,
limits the gain applied for tracks where clipping would occur.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2014-04-13 11:25:06 +02:00
Michael Niedermayer
6290ba0052
avfilter/settb: remove duplicate #include
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-10 21:58:03 +02:00
Michael Niedermayer
4764714952
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
libavfilter: Add asettb filter for setting timebase for audio
Conflicts:
Changelog
doc/filters.texi
libavfilter/Makefile
libavfilter/allfilters.c
libavfilter/settb.c
libavfilter/version.h
See: ba856c0be5
and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-10 15:08:04 +02:00
Nicolas George
ad8159e0fe
libavfilter: Add asettb filter for setting timebase for audio
...
Ported asettb (including the sr option for audio sample rate) from FFmpeg,
and copied/modified the existing settb documentation for asettb.
Signed-off-by: Katerina Barone-Adesi <katerinab+libav@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2014-04-10 12:52:19 +02:00
Michael Niedermayer
e36aaeca3a
avfilter/vf_colormatrix: fix memleak on error
...
Fixes CID1197065
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-08 01:25:00 +02:00
Michael Niedermayer
ebb21887b8
Merge commit '01c5779f56cf708e6cb88b11cfdc248cae7e2ee8'
...
* commit '01c5779f56cf708e6cb88b11cfdc248cae7e2ee8':
x86: Drop some unnecessary YASM ifdefs
Conflicts:
libavfilter/x86/vf_yadif_init.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-05 19:16:39 +02:00
Michael Niedermayer
b6850e132f
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
af_ashowinfo: print a more descriptive name for AV_MATRIX_ENCODING_DOLBY
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-05 00:42:47 +02:00
Michael Niedermayer
37af487170
Merge commit 'a49aa440c939e221194f8d95bf98673f8cf38a06'
...
* commit 'a49aa440c939e221194f8d95bf98673f8cf38a06':
af_volume: implement replaygain pre-amplification
Conflicts:
doc/filters.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-05 00:16:53 +02:00
Diego Biurrun
01c5779f56
x86: Drop some unnecessary YASM ifdefs
...
Dead code elimination is enough to avoid undefined references in these cases.
2014-04-04 19:08:05 +02:00
Anton Khirnov
9c21c08fa7
af_ashowinfo: print a more descriptive name for AV_MATRIX_ENCODING_DOLBY
2014-04-04 18:54:47 +02:00
Alessandro Ghedini
a49aa440c9
af_volume: implement replaygain pre-amplification
...
This adds a new "replaygain_preamp" option to the filter, and simply adds its
value to the replaygain gain value.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2014-04-04 18:53:05 +02:00
Roman Fietze
f5d718ac7e
avfilter.h, buffer.c: use const src pointer in avfilter_copy_buffer_ref_props
...
Signed-off-by: Roman Fietze <roman.fietze@telemotive.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-03 13:49:13 +02:00
Michael Niedermayer
0652ffc69a
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
vf_settb: rename to settb
Conflicts:
libavfilter/Makefile
libavfilter/f_settb.c
libavfilter/settb.c
libavfilter/vf_settb.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-02 18:25:15 +02:00
Katerina Barone-Adesi
b33c64e4c2
vf_settb: rename to settb
...
An audio version of settb (asettb) will be added to this file.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-04-02 12:14:10 +02:00
Michael Niedermayer
e818ee090a
avfilter/vf_pullup: fix gray8
...
Fixes segfault
Fixes Ticket3469
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-31 03:22:20 +02:00
Michael Niedermayer
de96e20be9
avfilter/lavfutils: call av_find_stream_info() before reading various information about the stream
...
No testcase with unmodified source is known
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-28 17:29:26 +01:00
Michael Niedermayer
3017239d3a
avfilter/vf_pullup: add comment to explain memset(0)
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-26 20:05:57 +01:00
Michael Niedermayer
a44409e692
avfilter/vf_pullup: zero freed memory for saftey
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-26 18:37:15 +01:00
wm4
5b0ce5d4e3
vf_pullup: simplify, fix double free error
...
The memory allocation for f->diffs was freed multiple times in some
corner cases. Simplify the code so that this doesn't happen.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-26 18:27:25 +01:00
Michael Niedermayer
10e931d514
Merge commit '6ee55c7b111eec6c51dfdc0fddbd46f5dd867fa3'
...
* commit '6ee55c7b111eec6c51dfdc0fddbd46f5dd867fa3':
vf_transpose: K&R formatting cosmetics
Conflicts:
libavfilter/vf_transpose.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-25 19:17:38 +01:00
Vittorio Giovara
6ee55c7b11
vf_transpose: K&R formatting cosmetics
2014-03-25 12:24:39 +01:00
Michael Niedermayer
15fe694e5c
Merge commit 'b4679ecdbd80ae050094733f137ccd7ebf1316ab'
...
* commit 'b4679ecdbd80ae050094733f137ccd7ebf1316ab':
{v,a}f_showinfo: print frame side data
Conflicts:
libavfilter/af_ashowinfo.c
libavfilter/vf_showinfo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-24 15:32:48 +01:00
Michael Niedermayer
8de75f703a
Merge commit '06c3cd3c0186803619bc6aad2d8f06c3e9015d15'
...
* commit '06c3cd3c0186803619bc6aad2d8f06c3e9015d15':
af_volume: support using replaygain frame side data
Conflicts:
doc/filters.texi
libavfilter/af_volume.c
libavfilter/af_volume.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-24 15:04:47 +01:00
Anton Khirnov
b4679ecdbd
{v,a}f_showinfo: print frame side data
2014-03-24 06:14:55 +01:00
Anton Khirnov
06c3cd3c01
af_volume: support using replaygain frame side data
2014-03-24 06:07:51 +01:00
Michael Niedermayer
7ef8d97b1a
Merge commit '7513234bdd93f80593bfee3eb2da8c8f0d3992da'
...
* commit '7513234bdd93f80593bfee3eb2da8c8f0d3992da':
avfilter: more correct printf format specifiers
Conflicts:
libavfilter/af_ashowinfo.c
libavfilter/vf_showinfo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-22 18:21:10 +01:00
Diego Biurrun
7513234bdd
avfilter: more correct printf format specifiers
2014-03-22 13:21:16 +01:00
Michael Niedermayer
48f7d5f0cf
avfilter/src_movie: Check that the pixel format hasnt changed
...
Fixes assertion failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-18 03:59:20 +01:00
Jasper Taylor
0d5ae023b2
avfilter/vf_tinterlace: Fix vf_tinterlace mode 6 (interlacex2)
...
The purpose of this filter mode is to allow interlaced content to
display properly in interlaced video modes, as described in
http://forum.xbmc.org/showthread.php?tid=81834 and
https://github.com/mpv-player/mpv/issues/624#issuecomment-37685195 . The
filter doubles the video frame rate, but does not work properly because:
(1) it does not set the properties of the output stream to indicate the
doubled frame rate, and
(2) it does not set an appropriate PTS on the extra frames.
The attached patch fixes these problems by settling these values the
same way they are set in vf_yadif mode 1 (field) which also doubles the
frame rate.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-16 17:25:54 +01:00
Michael Niedermayer
c198af648a
Merge commit 'e843612695007cc623813073754c651ab43021f7'
...
* commit 'e843612695007cc623813073754c651ab43021f7':
af_channelmap: fix ONE_STR mapping mode
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-16 14:18:01 +01:00
Anton Khirnov
e843612695
af_channelmap: fix ONE_STR mapping mode
...
get_channel() returns 0 on success
CC:libav-stable@libav.org
2014-03-16 07:43:52 +01:00
Yu Xiaolei
fbe9ae482d
avfilter: make avfilter_graph_get_filter use const string name
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-14 23:18:59 +01:00
Nicolas George
bc6901c949
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 .
2014-03-08 12:31:00 +01:00
Michael Niedermayer
ffe7e7c195
avfilter/vf_shuffleplanes: Fix flags / add AV_OPT_FLAG_FILTERING_PARAM
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-06 16:58:24 +01:00
Michael Niedermayer
d168729004
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
vf_shuffleplanes: fix the type of the mapping indices
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-06 15:18:14 +01:00
Michael Niedermayer
2fb0027c26
Merge commit '599b81ca9a8e04a27ddad94af462171d16063167'
...
* commit '599b81ca9a8e04a27ddad94af462171d16063167':
lavfi: add shuffleplanes filter
Conflicts:
Changelog
doc/filters.texi
libavfilter/Makefile
libavfilter/allfilters.c
libavfilter/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-06 13:07:20 +01:00
Michael Niedermayer
b76059058a
Merge commit 'bba2a7cc5f7c7aaa32a938f3d4edd9f555f39cdb'
...
* commit 'bba2a7cc5f7c7aaa32a938f3d4edd9f555f39cdb':
lavfi: use the correct filter context for logging an error.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-06 12:38:09 +01:00
Anton Khirnov
713d3f98c8
vf_shuffleplanes: fix the type of the mapping indices
...
They are TYPE_INT AVOptions, so they must be ints
2014-03-06 09:24:53 +01:00
Anton Khirnov
599b81ca9a
lavfi: add shuffleplanes filter
2014-03-05 21:52:02 +01:00
Anton Khirnov
bba2a7cc5f
lavfi: use the correct filter context for logging an error.
2014-03-05 21:52:02 +01:00
Michael Niedermayer
e3c93f1f84
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
avfilter: Add missing emms_c when needed
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-05 13:51:44 +01:00
Luca Barbato
e995cf1bcc
avfilter: Add missing emms_c when needed
...
Arch specific calls should have an emms_c following to keep the cpu
state consistent.
Reported-By: wm4
CC: libav-stable@libav.org
2014-03-05 11:00:05 +01:00
Vittorio Giovara
4c41a7a179
vf_frei0r: fix missing end of line character
...
Error introduced in 61b323ce7c
.
2014-03-04 18:27:09 +01:00
Michael Niedermayer
bfe03205a8
Merge commit '4e0be9c86f2003dd3ba2eb8fad01e8d0e538075e'
...
* commit '4e0be9c86f2003dd3ba2eb8fad01e8d0e538075e':
vf_frei0r: prevent a segfault when filter parameters are not set
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-04 13:17:25 +01:00
Michael Niedermayer
2b0ff8d642
Merge commit '8accddeb5806cd98e3803b4ddf2a2ef576d0e4d9'
...
* commit '8accddeb5806cd98e3803b4ddf2a2ef576d0e4d9':
vf_frei0r: adjust error messages
Conflicts:
libavfilter/vf_frei0r.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-04 12:41:31 +01:00
Vittorio Giovara
61b323ce7c
vf_frei0r: refactor library loading from env variable
...
strtok_r is not needed any more, so remove it from configure.
2014-03-04 11:39:02 +01:00
Vittorio Giovara
4e0be9c86f
vf_frei0r: prevent a segfault when filter parameters are not set
2014-03-04 11:19:03 +01:00
Vittorio Giovara
8accddeb58
vf_frei0r: adjust error messages
2014-03-04 11:19:03 +01:00
Anton Khirnov
bc6461c286
af_compand: replace strtok_r() with av_get_token()
2014-02-28 21:55:46 +01:00