Commit Graph

4162 Commits

Author SHA1 Message Date
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

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2014-02-02 16:21:50 +01:00
Stefano Sabatini
e756effd58 lavfi/movie: fix display of pushed frame information
It was broken since 7e350379f8.

Also fix warnings:
libavfilter/src_movie.c: In function ‘describe_frame_to_str’:
libavfilter/src_movie.c:392:5: warning: ‘type’ is deprecated (declared at ./libavutil/frame.h:313) [-Wdeprecated-declarations]
libavfilter/src_movie.c:408:9: warning: ‘type’ is deprecated (declared at ./libavutil/frame.h:313) [-Wdeprecated-declarations]
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.

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
99c4abfe88 Revert "Revert "yadif: add parens around macro parameters""
This reverts commit ab00800cde.

Signed-off-by: Robert Krüger <krueger@lesspain.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
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.

Signed-off-by: Robert Krüger <krueger@lesspain.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
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
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-27 12:01:23 +01:00