42f5fc716e
Merge commit '481575d255195c6c2f32e04686b94de984ae78d4'
...
* commit '481575d255195c6c2f32e04686b94de984ae78d4':
avconv: remove -deinterlace
Conflicts:
Changelog
doc/ffmpeg.texi
ffmpeg.c
ffmpeg_opt.c
The merge removes the documentation for the deprecated -deinterlace
the code itself has already been replaced a while ago by code
that inserts yadif, that insertion code is left in place.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-08 12:07:56 +02:00
481575d255
avconv: remove -deinterlace
...
It is incompatible with refcounted frames and since it's been deprecated
for a long time now, fixing it is not worth the effort.
2013-05-07 12:31:55 +02:00
4451be5ce1
Merge commit 'b1ee8eec849f17fce2f411a297de9cbf2edaeb3a'
...
* commit 'b1ee8eec849f17fce2f411a297de9cbf2edaeb3a':
configure: Add basic valgrind-memcheck support
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-05 10:47:19 +02:00
b1ee8eec84
configure: Add basic valgrind-memcheck support
...
With the parameter --valgrind-memcheck, the configure script sets
reasonable defaults that can be overridden as explained in the
documentation.
The idea of using set_defaults is from Luca Barbato.
2013-05-04 12:17:51 +02:00
b937d3694e
doc/filters: document asetpts in single place
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-03 18:22:29 +00:00
f51aa92b0f
lavfi/testsrc: add support for color interactive command
2013-05-03 18:37:54 +02:00
ce322f4c19
extractplanes filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-03 16:30:39 +00:00
a5f8873620
silly typo fixes
2013-05-03 18:26:12 +02:00
6537827189
Merge commit 'e3b225a4fe0ff1e64a220b757c6f0a5cf9258521'
...
* commit 'e3b225a4fe0ff1e64a220b757c6f0a5cf9258521':
matroskaenc: add an option to put the index at the start of the file
Conflicts:
doc/muxers.texi
libavformat/matroskaenc.c
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-03 13:16:34 +02:00
6fc58a8cb6
Merge commit '507b1e454cf9953da3e18f33c9bd1fca78c97cb5'
...
* commit '507b1e454cf9953da3e18f33c9bd1fca78c97cb5':
avcodec: Add field order information to AVCodecParserContext.
Conflicts:
doc/APIchanges
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-03 12:15:01 +02:00
e3b225a4fe
matroskaenc: add an option to put the index at the start of the file
2013-05-03 08:32:35 +02:00
507b1e454c
avcodec: Add field order information to AVCodecParserContext.
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-05-03 08:16:10 +02:00
3319679d0a
Merge commit 'a1e05b0487a1939334c2920fc7f9936bc9efe876'
...
* commit 'a1e05b0487a1939334c2920fc7f9936bc9efe876':
lavfi: add trim and atrim filters.
Conflicts:
Changelog
doc/filters.texi
libavfilter/Makefile
libavfilter/allfilters.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-01 11:34:34 +02:00
1cba7fa364
Merge commit 'b472938233b98178ed6c1353c37e0dc7ab585902'
...
* commit 'b472938233b98178ed6c1353c37e0dc7ab585902':
lavfi: add an asetpts filter
Conflicts:
Changelog
doc/filters.texi
libavfilter/Makefile
libavfilter/allfilters.c
libavfilter/f_setpts.c
libavfilter/setpts.c
libavfilter/version.h
libavfilter/vf_setpts.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-01 10:59:21 +02:00
14f45bcbe7
doc/filters: fix scale example equivalence.
...
scale=w=200:h=100 and scale=w=200:h=100 are of course equivalent...
2013-05-01 04:46:14 +02:00
e3e66568cc
doc/filters: replace hqdn3d with smartblur in timeline section.
...
hqdn3d needs some adjustements before timeline support can be restored
(patch welcome).
2013-05-01 04:44:27 +02:00
a1e05b0487
lavfi: add trim and atrim filters.
2013-04-30 11:24:57 +02:00
b472938233
lavfi: add an asetpts filter
2013-04-30 11:17:57 +02:00
2bdd434931
lavfi/stereo3d: add support for alternating frames input & output format
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-30 09:13:36 +00:00
0400176772
lavfi/mp: remove mp=tinterlace wrapper
...
From various tests, there is no evidence that the filter is faster than
the native tinterlace, and it has several more limitations and a few
bugs.
See thread:
Subject: [FFmpeg-devel] [NOPATCH] lavfi/mp: drop tinterlace wrapper
Date: Wed, 5 Sep 2012 00:26:01 +0200
2013-04-28 13:16:40 +02:00
dfb3de21d8
doc/filters: apply various general fixes to vidstabdetect docs
...
Adopt generally used conventions, extend and clarify explanations.
2013-04-28 13:16:40 +02:00
9f3d873f5f
doc/filters: update/extend transpose filter documentation
...
In particular, deprecate numerical values for the dir option.
2013-04-27 20:34:02 +02:00
1e4f75debd
doc/filters: readjust w/h option descriptions
2013-04-27 18:47:51 +02:00
efff09418d
doc/filters: fix grammar for removelogo filter doc sentence
2013-04-27 18:47:45 +02:00
cc5c155959
astats filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-27 12:40:34 +00:00
7becddd5f3
doc/filters: remove non-existent ft_load_flags entry
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-26 23:37:37 +00:00
e0a636fadf
doc/filters: fix afade 2nd example
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-26 09:39:10 +00:00
cd134963e8
lavfi/unsharp: add opencl unsharp filter
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-26 03:05:26 +02:00
16cecf9c3d
doc/filters: put vidstab filters documentation in a sensible order
2013-04-25 11:26:33 +02:00
cb23de1904
doc/filters: remove "q" constant docs for noise mode
...
It was removed in 62447248f3
2013-04-25 11:19:53 +02:00
f40cf96ec0
doc: remove all-components.texi, include its content verbatim
...
Force re-generation of the manuals when an included file is modified.
The current dependency generation system is enable to track nested
inclusions.
The drawback is that the files will be generated even when there is no
strict need (for example if filters.texi is modified, ffmpeg.1 is
rebuilt), thus it trades a false negative with a false positive.
2013-04-25 11:19:53 +02:00
575399c7e1
Merge commit 'fc18cc44ebfae07da153dc782572e7ce2f6fe47d'
...
* commit 'fc18cc44ebfae07da153dc782572e7ce2f6fe47d':
fate: add CVFC1_Sony_C to h264 conformance tests
doc/APIchanges: add missing hashes and dates
Conflicts:
doc/APIchanges
tests/fate/h264.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-25 09:54:11 +02:00
c857c21a8c
doc/filters: reword vidstab options intro.
2013-04-24 18:30:42 +02:00
4364e1f150
lavfi: add video stabilization plugins using vid.stab library
...
vidstabdetect and vidstabtransform common functions for interfacing
vid.stab are in libavfilter/vidstabutils.c
Signed-off-by: Georg Martius <martius@mis.mpg.de>
2013-04-24 18:30:42 +02:00
6f1716c4b6
doc/filters: amend documentation for the hue filter
...
Make clear that the options accept an expression.
2013-04-24 17:47:10 +02:00
18144950d4
doc/filters: introduce example in vflip filter
2013-04-24 17:47:03 +02:00
892af3eb47
doc/filters: split luma/chroma descriptions for unsharp option
...
Honour declaration order in filter implementation, for shorthand
consistency.
2013-04-24 17:46:56 +02:00
35386fbf41
doc/APIchanges: add missing hashes and dates
2013-04-24 09:48:57 +02:00
dfdee6cab3
doc/filters: sort multimedia filters by name
...
Also favor the video filter name for indexing, in case there is an a*
audio filter variant.
2013-04-23 22:48:47 +02:00
488c760091
doc/filters: document geq rgb mode
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-23 16:13:53 +02:00
a9a537b154
avfilter/drawtext: add pict_type support
...
Fixes Ticket2470
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-23 03:35:28 +02:00
15d2f26998
lavfi/overlay: support timeline through the new system.
2013-04-23 01:02:28 +02:00
38853169ce
lavfi: add 'enable' command injection to filters supporting timeline.
2013-04-23 01:02:28 +02:00
fdd93eabfb
lavfi: add timeline support.
...
Flag added in a few simple filters. A bunch of other filters can likely
use the feature as well.
2013-04-23 01:02:27 +02:00
c81a706381
JPEG 2000 decoder for DCinema
...
Based on the 2007 GSoC project from Kamil Nowosad <k.nowosad@students.mimuw.edu.pl>
Updated to current programming standards, style and many more small
fixes by Diego Biurrun <diego@biurrun.de>.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-04-22 15:38:29 +02:00
2f11aa141a
lavfi: remove mp=down3dright
...
Same funcionality is provided by stereo3d=ab[2]{l,r}:sbs[2]{l,r}.
Additional "features" are barely useful and cause crash or artifacts.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-22 11:49:13 +00:00
0327400ee3
doc/filters: add examples for stereo3d
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-22 11:49:13 +00:00
4ac2da3793
lavfi/fade: Added ability to do video fade based on timestamp
2013-04-21 20:57:02 +02:00
3e40b85683
lavfi: add interleave filters
2013-04-21 18:24:04 +02:00
b57c23f8c8
lavfi: add asetrate filter.
2013-04-21 15:20:50 +02:00
Michael Niedermayer