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
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
Marton Balint
ead0dd3cf6
lavfi/frei0r: factorize plugin loading with static path
...
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Marton Balint <cus@passwd.hu>
2014-02-26 22:48:37 +01:00
Marton Balint
35ead1f281
lavfi/frei0r: search plugins in lib64 dirs on all architectures
...
As Reimar Döffinger pointed out there are non-x86 64bit architectures as well.
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Marton Balint <cus@passwd.hu>
2014-02-26 22:46:15 +01:00
Paul B Mahol
9f2a3bcee7
avfilter: remove superflous lines
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2014-02-26 16:37:59 +00:00
Paul B Mahol
a2e4b4e968
avfilter/af_compand: some more cosmetics to decrease difference with qatar
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2014-02-26 15:03:09 +00:00
Michael Niedermayer
8f946ac8ea
avfilter: remove af_compand_fork
...
All relevant changes except the float/double one have been merged
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-26 13:21:29 +01:00
Michael Niedermayer
c62d83a5e7
avfilter/af_compand: more cosmetics from libavfilter/af_compand_fork.c
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-26 13:12:38 +01:00
Michael Niedermayer
05412f4cd4
avfilter/af_compand: cosmetics from libavfilter/af_compand_fork.c
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-26 13:00:09 +01:00
Michael Niedermayer
5e02ff3e3d
avfilter/af_compand: switch defaults to libavfilter/af_compand_fork.c
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-26 13:00:09 +01:00
Michael Niedermayer
619d6b8f55
avfilter/af_compand: "use local variable for channels" from libavfilter/af_compand_fork.c
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-26 13:00:09 +01:00
Michael Niedermayer
e509df4bc8
avfilter/af_compand: error checks from libavfilter/af_compand_fork.c
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-26 13:00:09 +01:00
Michael Niedermayer
4b87975147
avfilter/af_compand: pts init code from libavfilter/af_compand_fork.c
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-26 12:46:04 +01:00
Michael Niedermayer
5c78fe08b0
avfilter/af_compand: cosmetics and doxy comment from libavfilter/af_compand_fork.c
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-26 12:42:47 +01:00
Michael Niedermayer
66ad3292eb
avfilter/af_compand: add Andrew Kelley to the copyright
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-26 12:40:33 +01:00
Michael Niedermayer
86a191e25b
avfilter/af_compand: merge avframe code from af_compand_fork
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-26 12:33:28 +01:00
Michael Niedermayer
27ba05adbc
avfilter/af_compand: merge uninit() calls on error from af_compand_fork.c
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-26 12:11:33 +01:00
Michael Niedermayer
8b80485960
avfilter/af_compand: also support '|' as seperator
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-26 12:04:00 +01:00
Michael Niedermayer
1df1a1fe61
avfilter/af_compand_fork: avoid strtok_r() so as not to break build
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-26 11:48:34 +01:00
Michael Niedermayer
22307f170f
avfilter/af_compand: whitespace changes from af_compand_fork
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-26 11:41:36 +01:00
Michael Niedermayer
5d166de258
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
lavfi: add compand audio filter
Conflicts:
Changelog
doc/filters.texi
libavfilter/Makefile
libavfilter/af_compand.c
libavfilter/allfilters.c
libavfilter/version.h
The filter is added as new one so as to ease clean merging of its changes
in debug-able steps
See: 6b68e2a43b
2014-02-26 11:27:02 +01:00
Andrew Kelley
738f83582a
lavfi: add compand audio filter
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2014-02-26 08:09:58 +01:00
Andrew Kelley
9e329185d7
avfilter/af_compand: fix invalid read
...
Fixes #3383 .
2014-02-25 19:00:14 +00:00
Michael Niedermayer
6b06f9f1bc
Merge commit '39c2880eeae6930b1036ce1f479afc1e1152c13f'
...
* commit '39c2880eeae6930b1036ce1f479afc1e1152c13f':
af_volume: preserve frame properties
Conflicts:
libavfilter/af_volume.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-24 22:13:42 +01:00
Michael Niedermayer
fc10ed2cac
Merge commit 'dcc7e4bf1d0913123bfafbc58bf47bd41dd5848d'
...
* commit 'dcc7e4bf1d0913123bfafbc58bf47bd41dd5848d':
af_resample: preserve frame properties
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-24 21:46:00 +01:00
Anton Khirnov
39c2880eea
af_volume: preserve frame properties
2014-02-24 17:32:26 +01:00
Anton Khirnov
dcc7e4bf1d
af_resample: preserve frame properties
2014-02-24 17:30:48 +01:00
Michael Niedermayer
2a3cb1cfca
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
Use av_frame_copy() to simplify code where appropriate.
Conflicts:
libavfilter/vf_copy.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-24 10:47:47 +01:00
Anton Khirnov
30517a9f05
Use av_frame_copy() to simplify code where appropriate.
2014-02-24 07:25:07 +01:00
Carl Eugen Hoyos
b89596a432
Fix FSF address in colormatrix and libzvbi license headers.
...
As reported by irc user aca.
The files in compat/avisynth are maintained elsewhere, no changes.
2014-02-22 11:17:56 +01:00
Michael Niedermayer
cbd9cc5997
Merge remote-tracking branch 'cigaes/master'
...
* cigaes/master:
lavfi/pan: use extended_data instead of data.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-20 02:53:39 +01:00
Michael Niedermayer
8f33810ed2
avfilter/vf_fps: fix rounding error accumulation
...
Fixes Ticket3329
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-20 02:36:02 +01:00
Michael Niedermayer
b14517d3cd
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
vf_interlace: deprecate lowpass option
Conflicts:
libavfilter/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-19 16:16:41 +01:00
Vittorio Giovara
35b05c5184
vf_interlace: deprecate lowpass option
2014-02-19 12:26:34 +01:00
Nicolas George
6c27aea811
lavfi/pan: use extended_data instead of data.
...
Fix trac ticket #3380 .
2014-02-19 11:29:15 +01:00
Nicholas Robbins
b4d308c04f
lavfi: adding dejudder filter to remove judder produced by partially telecined material.
...
Signed-off-by: Nicholas Robbins <nickrobbins@yahoo.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-16 17:43:58 +01:00
Paul B Mahol
709746b6af
avfilter/af_compand: do not leak frames on error
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2014-02-15 11:38:32 +00:00
Michael Niedermayer
baaa6d6785
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
lavfi doxy: add buffer{src,sink}.h to the main lavfi doxy group
Conflicts:
libavfilter/buffersink.h
libavfilter/buffersrc.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-15 04:05:04 +01:00
Michael Niedermayer
efe4a06929
Merge commit 'f758ea6e99af6ebd24bbe222898a921c222e5593'
...
* commit 'f758ea6e99af6ebd24bbe222898a921c222e5593':
buffersink: document special error codes returned from av_buffersink_get_frame
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-15 04:03:09 +01:00
Anton Khirnov
ba7dfe5c50
lavfi doxy: add buffer{src,sink}.h to the main lavfi doxy group
2014-02-14 22:02:39 +01:00
Anton Khirnov
f758ea6e99
buffersink: document special error codes returned from av_buffersink_get_frame
2014-02-14 22:02:25 +01:00
Clément Bœsch
0e97ec54de
avfilter/curves: support slice threading.
2014-02-13 14:35:10 +01:00
Clément Bœsch
13aec744c2
avfilter/lut3d: support slice threading.
2014-02-13 13:39:23 +01:00
Michael Niedermayer
1bc3f1b73d
Merge commit '4a7d3837b4dd17fff270b55166597c093204e542'
...
* commit '4a7d3837b4dd17fff270b55166597c093204e542':
buffersrc: Have function parameter names match between .c and .h file
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-12 14:49:29 +01:00
Diego Biurrun
4a7d3837b4
buffersrc: Have function parameter names match between .c and .h file
...
This fixes two related Doxygen warnings. Also document one parameter.
2014-02-12 12:08:02 +01:00
Clément Bœsch
b6c0f07d5a
avfilter/lut3d: inline whole loop in interpolation function.
...
84 → 92 fps here.
2014-02-12 10:12:48 +01:00
Marton Balint
8e41240047
lavfi/frei0r: load plugins from lib64 folders as well on 64bit builds
...
Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-11 03:25:00 +01:00
Clément Bœsch
f21d0beb0c
Fix a few heigth/height typo.
2014-02-07 09:33:56 +01:00
Michael Niedermayer
cddbe9fa2e
avfilter/dualinput: fix repeatlast to match docs and eof_action=pass
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-04 14:54:14 +01:00
Michael Niedermayer
905cd28a5a
Merge commit 'de203abd71baae7f120313259b45cf935c85203e'
...
* commit 'de203abd71baae7f120313259b45cf935c85203e':
vf_overlay: add eof_action switch
Conflicts:
doc/filters.texi
libavfilter/vf_overlay.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-04 14:33:33 +01:00
Keith Lawson
de203abd71
vf_overlay: add eof_action switch
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2014-02-04 10:54:26 +01:00
Matt Oliver
3e309c5d18
Fix compilation with msvc/icl due to missing header and define.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-03 19:48:41 +01:00
Jean First
2384cada12
lavfi/ebur128: add true peak metering per frame
...
Signed-off-by: Jean First <jeanfirst@gmail.com>
2014-02-02 20:45:09 +01:00
Jean First
6ef2315aaf
lavfi/ebur128: print peak metering in dBFS
...
Signed-off-by: Jean First <jeanfirst@gmail.com>
2014-02-02 20:45:09 +01:00
Clément Bœsch
7f42bfad5d
lavfi/ebur128: add sample and true peak metering.
...
Metadata injection and logging. Not yet present visually.
Signed-off-by: Jean First <jeanfirst@gmail.com>
2014-02-02 20:44:56 +01:00
Andrey Utkin
6d7119dbd2
lavfi/drawtext: fix reinit command
...
Problem was that reinit argument wasn't used.
Regression came in at commit fd6228e657
2014-02-02 16:21:50 +01:00
Stefano Sabatini
e756effd58
lavfi/movie: fix display of pushed frame information
...
It was broken since 7e350379f8
2014-02-02 15:54:26 +01:00
Stefano Sabatini
a270f63e83
lavfi/overlay: add yuv422 format mode
2014-02-02 11:50:21 +01:00
Michael Niedermayer
b50efe85ea
avfilter/vf_colormatrix: update output AVFrame colorspace
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-28 21:52:02 +01:00
Michael Niedermayer
3e41e747d6
avfilter/vf_colormatrix: Support using the source AVFrame colorspace if none is specified
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-28 21:52:00 +01:00
Michael Niedermayer
214a3b8bf9
avfilter/vf_scale: simplify alignment code
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-25 16:54:24 +01:00
Michael Niedermayer
1e48c39ece
avfilter/vf_scale: do aspect ratio and scale factor compensation together
...
Fixes rounding error
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-25 16:48:13 +01:00
Lars Kiesow
69b1d1d99b
Documentation for scale filter factor
2014-01-25 15:02:15 +01:00
Lars Kiesow
e395f8de5a
Fixed factor for scale filter
2014-01-25 15:00:02 +01:00
Lars Kiesow
7fc4c18463
Factors for scale filter
2014-01-25 14:40:48 +01:00
Ramiro Polla
78a9f185eb
lavfi/drawtext: add option for drawing border around text
...
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-25 04:59:28 +01:00
Ramiro Polla
222fb8276d
lavfi/drawtext: get bitmap from glyph in a separate step
...
This change makes it possible to transform the glyph or get its border before
turning it into a bitmap.
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-25 04:46:38 +01:00
Michael Niedermayer
41003da94a
avfilter/avfilter: fix use of uninitialized pointer
...
Fixes CID1163852
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-24 04:14:52 +01:00
Nicolas George
2dc5980d61
lavfi/dualinput: fix shortest option.
...
Fix trac ticket #3315 .
2014-01-19 17:13:36 +01:00
Nicolas George
77b8d4e521
lavfi/vf_tile: use av_make_q.
2014-01-19 17:13:02 +01:00
Nicolas George
c4b7ad324b
lavfi/avf_concat: use av_make_q.
2014-01-19 17:12:50 +01:00
Nicolas George
bf9908c627
lavfi/af_amerge: use av_make_q.
2014-01-19 17:12:40 +01:00
Stefano Sabatini
3dc494f8b9
lavfi/vidstabtransform: apply various documentation/option minor fixes
...
Improve consistency with the rest of the documentation.
2014-01-19 12:20:10 +01:00
João Bernardo
447d71b892
avfilter/vf_elbg: Fixed seed range of elbg filter
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-17 21:17:43 +01:00
Michael Niedermayer
cd259cdaa9
Merge commit '104a97beaffa6348e6fd2c2d07d67c1402322bb3'
...
* commit '104a97beaffa6348e6fd2c2d07d67c1402322bb3':
buffersrc: handle non-refcounted frames in av_buffersrc_add_frame() correctly
Conflicts:
libavfilter/buffersrc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-17 16:38:10 +01:00
Anton Khirnov
104a97beaf
buffersrc: handle non-refcounted frames in av_buffersrc_add_frame() correctly
2014-01-17 10:30:45 +01:00
Stefano Sabatini
a64333db5f
lavfi/vidstabtransform: apply various cosmetical nits
2014-01-16 12:35:17 +01:00
Georg Martius
2727dbb053
lavfi/vidstabdetect,vidstabtransform: update to vid.stab 0.98
...
In particular:
* set default value for accuracy to 15 (max)
* add zoomspeed for dynamic zoom (optzoom=2)
* make camera path optimization algorithm configurable
* update optzoom documenation in code to use new localmotions calculation function commandline arguments
* add debug option in vidstabtransform
Signed-off-by: Georg Martius <martius@mis.mpg.de>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2014-01-16 12:23:48 +01:00
Robert Krüger
194ef56ba7
Change license of yadif from GPL to LGPL
...
Signed-off-by: Robert Krüger <krueger@lesspain.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-14 14:19:15 +01:00
Robert Krüger
6109399366
Revert "avfilter/yadif: Revert "lavfi: convert input/ouput list compound literals to named objects""
...
This reverts commit 4ef4bb4a20
2014-01-14 14:19:15 +01:00
Robert Krüger
99c4abfe88
Revert "Revert "yadif: add parens around macro parameters""
...
This reverts commit ab00800cde
2014-01-14 14:19:14 +01:00
Robert Krüger
4a38eeec38
Revert "Revert "vf_yadif: move x86 init code to x86/yadif.c""
...
This reverts commit 975110a85e
2014-01-14 14:19:14 +01:00
Robert Krüger
d8e763fda7
vf_yadif: Relicense from GPL to LGPL
...
All copyright holders have agreed to the relicensing.
2014-01-14 00:04:59 +01:00
Michael Niedermayer
d9481dcd61
Merge commit 'abb5e37f64c48bba8bd0fde2bada0f7544defa24'
...
* commit 'abb5e37f64c48bba8bd0fde2bada0f7544defa24':
avfilter: fix leaks on error in ff_filter_frame
Conflicts:
libavfilter/avfilter.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-10 03:46:28 +01:00
Michael Niedermayer
8788d31606
Merge commit '5655732c77f2df9c1dfbddc30cd4844390a6921f'
...
* commit '5655732c77f2df9c1dfbddc30cd4844390a6921f':
avfilter: add needs_writable field to the internal AVFilterPad structure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-10 03:37:03 +01:00
Michael Niedermayer
48276731d6
Merge commit 'd44bd7fb27d4121512eae0ffce5e48bac25e82dc'
...
* commit 'd44bd7fb27d4121512eae0ffce5e48bac25e82dc':
avfilter: add documentation for needs_writable
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-10 03:34:52 +01:00
Michael Niedermayer
402a411406
Merge commit 'a7d0e7ead95e584c4866617f046b2493066975c6'
...
* commit 'a7d0e7ead95e584c4866617f046b2493066975c6':
lavfi: add framepack filter
Conflicts:
Changelog
doc/filters.texi
libavfilter/allfilters.c
libavfilter/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-10 03:00:48 +01:00
Vittorio Giovara
abb5e37f64
avfilter: fix leaks on error in ff_filter_frame
2014-01-09 23:13:05 +01:00
Vittorio Giovara
5655732c77
avfilter: add needs_writable field to the internal AVFilterPad structure
2014-01-09 23:13:05 +01:00
Vittorio Giovara
d44bd7fb27
avfilter: add documentation for needs_writable
2014-01-09 23:13:05 +01:00
Vittorio Giovara
a7d0e7ead9
lavfi: add framepack filter
2014-01-09 23:13:05 +01:00
Michael Niedermayer
c0a33c4770
avfilter: avfilter_register() that works in O(1) time
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-09 00:53:04 +01:00
Luca Barbato
d68dc3c944
drawtext: Drop pointless header
...
It should be forward compatible with newer freetype.
2014-01-06 11:44:10 +01:00
Michael Niedermayer
ee16e0cacc
avfilter/vf_format: check that the format list is not empty
...
Fixes Ticket3210
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-05 20:14:03 +01:00
Clément Bœsch
307b6b8cb4
avfilter/lut3d: fix channel order in Iridas format parsing.
...
According to http://doc.iridas.com/index.php?title=LUT_Formats
for 3D textures, the data is also RGB, and ordered in such a way
that the red coordinate changes fastest, then the green coordinate,
and finally, the blue coordinate changes slowest:
Fixes Ticket #3236 .
2014-01-04 09:42:31 +01:00
Reimar Döffinger
3cc0f335fe
af_aresample: remove only use of array compound literals with non-const initializers in FFmpeg.
...
Some older compilers might have particular trouble with them,
and they do not really seem worth it to me.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2013-12-30 12:38:04 +01:00
Michael Niedermayer
25b243759c
Merge commit 'b83d1ee3b41cfe8357836e2582104db2f3364cb0'
...
* commit 'b83d1ee3b41cfe8357836e2582104db2f3364cb0':
avutil: Move library version related macros to version.h
Conflicts:
libavcodec/version.h
libavresample/version.h
libavutil/avutil.h
libavutil/utils.c
See: 183117fed7
2013-12-27 12:01:23 +01:00
Diego Biurrun
b83d1ee3b4
avutil: Move library version related macros to version.h
...
This is a more sensible place for these macros.
2013-12-26 19:05:22 +01:00
Clément Bœsch
ec73bd1fe8
avfilter/avectorscope: fix {} mistake in alloc check.
2013-12-26 13:49:15 +01:00
Stefano Sabatini
cd355d4d59
lavfi/abuffersrc: use AV_OPT_TYPE_SAMPLE_FMT for sample_fmt option
...
Simplify/extend syntax.
2013-12-26 11:35:27 +01:00
Stefano Sabatini
3b8c7da7a3
lavu,lavfi,lavd: do not hardcode AV_PIX_FMT_NB value when setting pixel format max value
...
The constant may change in libavutil but the library may be compiled
against an older version, thus rejecting a value which is otherwise
supported by the new libavutil.
INT_MAX is used here to denote the max allowed value for a pixel format.
The opt-test code is changed to provide a valid reference example.
2013-12-26 11:35:27 +01:00
Stefano Sabatini
baeda2bf92
lavfi/volume: fix NULL reference in filter_frame()
...
Fix crash.
2013-12-25 19:13:23 +01:00
Stefano Sabatini
ca0d8e839e
lavfi/volume: extend volume logging
2013-12-25 18:26:34 +01:00
Stefano Sabatini
97aa554634
lavfi/volume: implement process_command() callback, with the volume command
...
Address trac ticket #2868 .
2013-12-25 18:25:53 +01:00
Stefano Sabatini
7619a87cc8
lavfi/volume: support volume expression and per-frame expression evaluation
...
The eval mode allows to evaluate the expression per-frame or just at
init.
In particular, address ticket #3234 .
2013-12-25 18:25:04 +01:00
Stefano Sabatini
d055a1395c
lavfi/hue: show first decimal value of saturation
2013-12-20 19:25:42 +01:00
Stefano Sabatini
028d8dd367
lavfi/hue: use av_clip_uint8() instead of av_clip_uint8_c()
...
The generic version should be faster if optimized.
2013-12-20 19:13:42 +01:00
Stefano Sabatini
70e74e0072
lavfi/hue: force table initialization for the first frame
2013-12-20 19:13:42 +01:00
Lenny Wang
d943330dc0
lavfi/deshake_opencl: optimze transform filter
...
Reviewed-by: Wei Gao <highgod0401@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-19 13:31:31 +01:00
Michael Niedermayer
a788949255
Merge commit '6d3ea1957f681b3bf9c752e6d21a501cc8d4180d'
...
* commit '6d3ea1957f681b3bf9c752e6d21a501cc8d4180d':
Bump major of libavfilter for reference counted buffer API changes.
Conflicts:
libavfilter/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-16 22:07:24 +01:00
Stefano Sabatini
023693d786
lavfi/buffersrc: set min and max values for pix_fmt option
...
Currently the min and max values are not honored, but this will change in
a following patch.
2013-12-16 18:08:17 +01:00
Reinhard Tartler
6d3ea1957f
Bump major of libavfilter for reference counted buffer API changes.
...
Applications that have been linked against an older release of Libav and pick up
updated libraries experience segmentation faults because they pick up the new
libavfilter, which assumes AVFrames have been allocated by libavutil and thus
contain new reference-counting related fields. This will break for AVFrames that
have been allocated by old libavcodec.
All scheduled API changes are deferred to the next bump.
2013-12-14 16:31:32 -05:00
Michael Niedermayer
47eb15b989
avfilter/vf_pullup: fix memleak on error
...
Fixes CID1108604
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-13 15:14:03 +01:00
Michael Niedermayer
8f9569cfac
avfilter/vf_pullup: Factor free_field_queue() out
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-13 15:13:01 +01:00
Michael Niedermayer
0fe6906d96
avfilter/aeval: Fix use of uninitialized variable
...
Fixes CID1135776
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-11 15:31:32 +01:00
Alexander Strasser
cea5812fa7
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.
Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
2013-12-08 18:21:46 +01:00
Michael Niedermayer
bc9cee98c0
avfilter/vf_mergeplanes: specify pixel format min/max
...
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-08 16:07:19 +01:00
Michael Niedermayer
133fbfc781
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>
2013-12-06 15:27:36 +01:00
Stefano Sabatini
8f1edc73a8
lavfi: rename asrc_aevalsrc.c to aeval.c
...
The file now contains both source and filter, the new name looks more
appropriate.
2013-12-06 10:57:28 +01:00
Stefano Sabatini
e424abc3a0
lavfi: add aeval filter
2013-12-06 10:57:26 +01:00
Stefano Sabatini
405b3eb535
lavfi/aevalsrc: duplicate last expression for the missing channels
...
Use last expression for the missing channel expressions in case the
channel layout was specified. Enhance flexibility.
2013-12-06 10:51:12 +01:00
James Almer
56572787ae
Add Windows resource file support for shared libraries
...
Originally written by James Almer <jamrial@gmail.com>
With the following contributions by Timothy Gu <timothygu99@gmail.com>
* Use descriptions of libraries from the pkg-config file generation function
* Use "FFmpeg Project" as CompanyName (suggested by Alexander Strasser)
* Use "FFmpeg" for ProductName as MSDN says "name of the product with which the
file is distributed" [1].
* Use FFmpeg's version (N-xxxxx-gxxxxxxx) for ProductVersion per MSDN [1].
* Only build the .rc files when --enable-small is not enabled.
[1] http://msdn.microsoft.com/en-us/library/windows/desktop/aa381058.aspx
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-05 23:42:07 +01:00
Michael Niedermayer
0cc5011f9a
avfilter/vf_pad: fix req_end
...
Fixes out of array accesses
Fixes Ticket3190
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-03 04:09:10 +01:00
Stefano Sabatini
d5d51cf04d
lavfi/volume: support all channel counts
2013-12-02 23:52:24 +01:00
Michael Niedermayer
975110a85e
Revert "vf_yadif: move x86 init code to x86/yadif.c"
...
This reverts commit a87b17f328
2013-12-01 20:26:26 +01:00
Michael Niedermayer
ab00800cde
Revert "yadif: add parens around macro parameters"
...
This reverts commit 49e617f956
2013-12-01 20:26:26 +01:00
Michael Niedermayer
4ef4bb4a20
avfilter/yadif: Revert "lavfi: convert input/ouput list compound literals to named objects"
...
This reverts commit 568c70e79e
2013-12-01 20:26:26 +01:00
James Almer
19e301b9ed
lavfi/Makefile: Don't compile lavfutils.c and lswsutils.c if they are not needed
...
They are only needed by removelogo.
This fixes a link failure in shared builds when compiling with
removelogo disabled but Lavf/SwS enabled
Signed-off-by: James Almer <jamrial@gmail.com>
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-30 13:29:27 +01:00
Michael Niedermayer
ccdfa3e271
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
Add missing #includes for *INT64_MAX and *INT64_C
Conflicts:
ffmpeg.c
ffmpeg_filter.c
ffplay.c
libavformat/assdec.c
libavformat/avidec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-24 05:21:19 +01:00
Diego Biurrun
8f8bc92365
Add missing #includes for *INT64_MAX and *INT64_C
2013-11-23 21:55:52 +01:00
Stefano Sabatini
98786aa2f0
lavfi/aevalsrc: initialize pointer to expression to NULL
...
Fix crash in case of expression parsing failure.
2013-11-21 23:14:38 +01:00
Clément Bœsch
ddaf543aa6
avfilter/showspectrum: use 0 dummies for range in const.
...
This is consistent with other options.
2013-11-20 16:38:09 +01:00
Clément Bœsch
9343fc30e2
avfilter/showspectrum: reindent const options.
2013-11-20 16:37:34 +01:00
Clément Bœsch
9c8b240806
avfilter/showspectrum: add blackman window.
2013-11-20 16:35:48 +01:00
Clément Bœsch
3e69f7c221
avfilter/showspectrum: add win_func option.
2013-11-20 16:22:05 +01:00
Michael Niedermayer
6a71efff33
avfilter/vf_tinterlace: check clone return value
...
Inspired by: 3a16ec19d2
2013-11-19 18:08:58 +01:00
Michael Niedermayer
0a382aa99b
Merge commit '3a16ec19d2426457419cb8a7304f97982699efda'
...
* commit '3a16ec19d2426457419cb8a7304f97982699efda':
vf_interlace: check one av_frame_clone allocation
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-19 18:06:40 +01:00
Vittorio Giovara
3a16ec19d2
vf_interlace: check one av_frame_clone allocation
2013-11-19 14:48:36 +01:00
Vallimar
6f5c36832d
avfilter/vf_mp: fix missing FF_API_XVMC check
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-18 01:22:30 +01:00
Michael Niedermayer
0ee905e243
Merge commit '5b9c3b4505206143d85398c1410949319fa1180f'
...
* commit '5b9c3b4505206143d85398c1410949319fa1180f':
Replace all instances of avcodec_alloc_frame() with av_frame_alloc().
Conflicts:
doc/examples/decoding_encoding.c
doc/examples/muxing.c
ffmpeg.c
libavcodec/alacenc.c
libavcodec/libopenjpegenc.c
libavcodec/libvpxenc.c
libavcodec/pcm.c
libavcodec/xbmenc.c
libavcodec/xwdenc.c
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-16 23:54:10 +01:00
Alex Sukhanov
86b3435fc0
af_aresample: Fix timestamp of first padded PCM audio packet
...
Problem:
ffmpeg generated video file which had two audio packets with the same timestamp: last original audio packet and first padded audio packet.
Timestamp of first added audio packet by 'apad' fitler had the same value as last original audio packet. The problem was in 'aresample' fitler, which used next pts instead of current one.
As long as 'apad' and 'aresample' filters have separate mechanisms of timestamp calculation, they got the same values.
Command line:
ffmpeg -i <input_filename> -shortest -apad 512 -af asetnsamples=n=512 -b:a 1058400 -ac 1 -ar 44100 -async 0 -acodec pcm_s16le -sn -f matroska -y <output_file>
Fix:
Call swr_next_pts() function before swr_convert()
Tested:
FATE tests passed.
Fix has been tested in our Transcoder regression framework on ~10k test videos. It's about ~500k transcodes.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-15 11:54:02 +01:00
Stefano Sabatini
8cd3685a3f
lavfi: add elbg filter
2013-11-13 11:21:57 +01:00
Clément Bœsch
199b8fbd09
avfilter/fade: use FADE_OUT macro.
2013-11-10 19:16:45 +01:00
Clément Bœsch
981128c2c1
avfilter/fade: remove a bunch of useless parenthesis.
2013-11-10 19:15:48 +01:00
Clément Bœsch
461e810cfc
avfilter/fade: use inlink->frame_count.
2013-11-10 19:12:36 +01:00
Clément Bœsch
3e1097b909
avfilter/fade: add color option.
...
Fixes Ticket #1822 .
2013-11-10 19:05:08 +01:00
Michael Niedermayer
175e689cc5
avfilter/graphparser: zero filter_ctx in case of deallocation in create_filter()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-07 23:38:44 +01:00
Michael Niedermayer
ec8e68c763
Merge commit 'cffecc0e7ebd642afaa1fb9f56fab1fcc283293c'
...
* commit 'cffecc0e7ebd642afaa1fb9f56fab1fcc283293c':
avfilter/graphparser: Directly free filter memory if initialization fails
Conflicts:
libavfilter/graphparser.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-07 23:05:26 +01:00
Lenny Wang
7c02a77d25
avfilter/unsharp: added optimized opencl kernels
...
Reviewed-by: Wei Gao <highgod0401@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-07 22:31:43 +01:00
Paul B Mahol
d9d752cfb5
avfilter/af_aecho: free input frame after it is being used
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-11-07 17:45:47 +00:00
Michael Niedermayer
ea6331b2c6
avfilter/af_aresample: Calculate output buffer size more precisely.
...
Fixes accumulation of data in case of significant silence injections
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-06 23:54:02 +01:00
Diego Biurrun
cffecc0e7e
avfilter/graphparser: Directly free filter memory if initialization fails
2013-11-06 22:06:15 +01:00
Lenny Wang
89a3be8921
avfilter/opencl: compile kernels separately
...
Reviewed-by: Wei Gao <highgod0401@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-05 14:29:55 +01:00
Michael Niedermayer
be74cb5159
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
avfilter/buffer: Suppress deprecation warning for avfilter_unref_buffer
Conflicts:
libavfilter/buffer.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-05 12:17:35 +01:00
Stefano Sabatini
988e2e7c1c
lavfi/ladspa: cast return value of av_x_if_null to char*, fix warnings
2013-11-05 00:04:17 +01:00
Diego Biurrun
7d1a68e95b
avfilter/buffer: Suppress deprecation warning for avfilter_unref_buffer
...
The function is used in a block of code that is deprecated anyway.
2013-11-04 23:04:10 +01:00
Diego Biurrun
e73996954d
filtfmts-test: Fix use of deprecated API
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2013-11-04 16:20:44 +01:00
Michael Niedermayer
d0ac60730d
avfilter/vf_scale: add ov/hsub
...
Suggested-by: divVerent
Reviewed-by: Stefano
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-04 15:23:26 +01:00
Vittorio Giovara
446e37dc97
vf_fieldorder: remove superfluous get_video_buffer
2013-11-04 14:37:06 +01:00
Paul B Mahol
3d9fc5c6ad
avfilter/vf_aspect: remove dupe constants setup
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-11-03 16:39:22 +00:00
Michael Niedermayer
2ed562d5fa
Merge remote-tracking branch 'cigaes/master'
...
* cigaes/master:
lavfi/af_pan: support unknown layouts on input.
lavfi/af_pan: support unknown layouts on output.
lswr: fix assert failure on unknown layouts.
lavfi: parsing helper for unknown channel layouts.
lavfi/avfiltergraph: do not reduce incompatible lists.
lavfi/avfiltergraph: suggest a solution when format selection fails.
lavd/lavfi: support unknown channel layouts.
lavf/wavenc: check for a single stream.
lavd/alsa: add stream validation
lavd/alsa: fix timestamp calculation
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-03 13:57:05 +01:00
Michael Niedermayer
a75bf4e5c1
Merge commit '34a0ac41a880039c7fb4b3abce10d8e2ce48fac7'
...
* commit '34a0ac41a880039c7fb4b3abce10d8e2ce48fac7':
vf_aspect: support variables in evaluating the aspect ratios
Conflicts:
Changelog
doc/filters.texi
libavfilter/vf_aspect.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-03 11:54:19 +01:00
Nicolas George
7b0a587393
lavfi/af_pan: support unknown layouts on input.
...
Fix trac ticket #2899 .
2013-11-03 10:30:50 +01:00
Nicolas George
4e9adc9b73
lavfi/af_pan: support unknown layouts on output.
2013-11-03 10:30:47 +01:00
Nicolas George
6e2473edfd
lavfi: parsing helper for unknown channel layouts.
...
Make ff_parse_channel_layout() accept unknown layouts too.
2013-11-03 10:30:25 +01:00
Nicolas George
d300f5f6f5
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.
2013-11-03 10:30:16 +01:00
Nicolas George
f775eb3fb4
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.
2013-11-03 10:30:08 +01:00
Rudolf Polzer
3a14b160bd
vf_scale: make the dar variable return the DAR.
...
Before, it just returned width/height. Correct is width/height*sar.
That way it is consistent with DAR as in probe output and setdar.
Signed-off-by: Rudolf Polzer <divverent@xonotic.org>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-11-02 21:16:29 +01:00
Rudolf Polzer
34a0ac41a8
vf_aspect: support variables in evaluating the aspect ratios
...
Example: -vf setsar=sar="sar*9/10"
Signed-off-by: Rudolf Polzer <divverent@xonotic.org>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-11-02 21:14:08 +01:00
Michael Niedermayer
599c285162
avfilter/vf_gradfun: add emms_c() for mmxext
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-01 14:42:06 +01:00
Clément Bœsch
969329fe11
Revert "Merge commit 'ed1a11ed52bbd1f15bb9b0416d69b7924bee3191'"
...
This reverts commit fc5fe4804fffe3350098
2013-11-01 14:28:08 +01:00
Michael Niedermayer
c6125f5e1c
avfilter/x86/vf_gradfun_init: fix some consts & related warnings
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-01 14:20:10 +01:00
Michael Niedermayer
fc5fe4804f
Merge commit 'ed1a11ed52bbd1f15bb9b0416d69b7924bee3191'
...
* commit 'ed1a11ed52bbd1f15bb9b0416d69b7924bee3191':
gradfun: x86: Factor out common code for some gradfun_filter_line() variants
Conflicts:
libavfilter/x86/vf_gradfun_init.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-01 10:26:49 +01:00
Michael Niedermayer
ffe3350098
Merge commit 'ee80cf741a44115758e62399b7bde08d33161151'
...
* commit 'ee80cf741a44115758e62399b7bde08d33161151':
avfilter: x86: K&R formatting cosmetics
Conflicts:
libavfilter/x86/vf_gradfun_init.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-01 10:20:20 +01:00
Diego Biurrun
ed1a11ed52
gradfun: x86: Factor out common code for some gradfun_filter_line() variants
2013-10-31 16:34:18 +01:00
Diego Biurrun
ee80cf741a
avfilter: x86: K&R formatting cosmetics
2013-10-31 12:15:54 +01:00
Carl Eugen Hoyos
e4b0a77021
libavfilter/decimate: Add pts of first frame to all frames.
...
Fixes ticket #3019
Reviewed-by: Clément Bœsch
2013-10-31 11:24:43 +01:00
Michael Niedermayer
325f6e0a97
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
lavfi: do not export the filters from shared objects
Conflicts:
libavfilter/af_amix.c
libavfilter/af_anull.c
libavfilter/asrc_anullsrc.c
libavfilter/f_select.c
libavfilter/f_settb.c
libavfilter/split.c
libavfilter/src_movie.c
libavfilter/vf_aspect.c
libavfilter/vf_blackframe.c
libavfilter/vf_colorbalance.c
libavfilter/vf_copy.c
libavfilter/vf_crop.c
libavfilter/vf_cropdetect.c
libavfilter/vf_drawbox.c
libavfilter/vf_format.c
libavfilter/vf_framestep.c
libavfilter/vf_frei0r.c
libavfilter/vf_hflip.c
libavfilter/vf_libopencv.c
libavfilter/vf_lut.c
libavfilter/vf_null.c
libavfilter/vf_overlay.c
libavfilter/vf_scale.c
libavfilter/vf_transpose.c
libavfilter/vf_unsharp.c
libavfilter/vf_vflip.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-29 11:58:11 +01:00
Anton Khirnov
cd43ca0443
lavfi: do not export the filters from shared objects
2013-10-28 15:29:54 +01:00
Michael Niedermayer
a1ce060c51
Merge commit '5c439b41d0489412c0a4cf6dfb98915251677b8e'
...
* commit '5c439b41d0489412c0a4cf6dfb98915251677b8e':
avfilter: have avfilter_get_by_name return const for next bump
Conflicts:
libavfilter/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-28 13:07:05 +01:00
Vittorio Giovara
884c7a6eb8
avfilter: fix const use of avfilter_next
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-10-28 07:58:23 +01:00
Vittorio Giovara
5c439b41d0
avfilter: have avfilter_get_by_name return const for next bump
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-10-28 07:57:44 +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
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
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
