virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity
33,234 Commits 37 Branches 400 Tags 460 MiB
7af99a01c4
Commit Graph

930 Commits

Author SHA1 Message Date
Anton Khirnov
7af99a01c4 graphparser: fix the order in which unlabeled input links are returned. 2012-04-15 20:20:03 +02:00
Anton Khirnov
7bf9e3391f vsrc_buffer: fix check from 7ae7c41. 
The user submitted variable in this function is frame, not buf.
 2012-04-14 18:58:20 +02:00
Stefano Sabatini
91d3cbe0fd avfiltergraph: make the AVFilterInOut alloc/free API public 
This is required for letting applications to create and destroy
AVFilterInOut structs in a convenient way.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2012-04-14 09:25:46 +02:00
Anton Khirnov
12e7e1d03e graphparser: allow specifying sws flags in the graph description. 2012-04-14 09:25:46 +02:00
Anton Khirnov
4e781c25b7 graphparser: fix the order of connecting unlabeled links. 
Right now, e.g. scale,[in]overlay would connect scale to the first
overlay input and [in] to the second, which goes against the
documentation and is unintuitive.

The bug happens because of the ordering mess in curr_inputs variable:
1) the unlabeled links from the previous filter are added to it in
correct order
2) input labels are parsed and inserted to the beginning one by one
(i.e. in reverse order)
3) curr_inputs is matched against filter inputs in reverse order

Fix the problem by always using proper ordering without trying to be
clever.
 2012-04-14 09:25:46 +02:00
Anton Khirnov
d7bcc71dad graphparser: add avfilter_graph_parse2(). 
Unlike avfilter_graph_parse(), it returns unlinked inputs and outputs
to the caller, which allows parsing of graphs where inputs/outputs are
not known in advance.
 2012-04-14 09:25:46 +02:00
Anton Khirnov
7ae7c41413 vsrc_buffer: allow using a NULL buffer to signal EOF. 2012-04-14 09:25:46 +02:00
Anton Khirnov
e36b25d1df vf_overlay: implement poll_frame() 
Signal that it can output a frame when there are frames on the main
input and EOF on the overlay input, but a frame is buffered -- e.g.
single picture overlay.
 2012-04-09 21:30:21 +02:00
Anton Khirnov
90f65dc6cf vf_scale: support named constants for sws flags. 2012-04-09 21:29:05 +02:00
Anton Khirnov
a03f8ea0a8 vsrc_buffer: when no frame is available, return an error instead of segfaulting. 2012-04-05 09:30:09 +02:00
Diego Biurrun
1f068e4450 vf_unsharp: Mark readonly variable as const. 
This fixes the following warning:
libavfilter/vf_unsharp.c:106: warning: initialization discards qualifiers from pointer target type
 2012-04-04 19:34:40 +02:00
Anton Khirnov
95587d29d7 vsrc_buffer: allow buffering arbitrary number of frames. 2012-04-01 09:04:19 +02:00
Anton Khirnov
416fd90ead vf_scale: avoid a pointless memcpy in no-op conversion. 
I.e. just pass the buffer along when src parameters == dst parameters.
 2012-04-01 09:04:14 +02:00
Anton Khirnov
63736fe48c avfiltergraph: try to reduce format conversions in filters. 
Current code, with a filterchain such as
(input - yuv411) -> (scale - any) -> (sink - any)
will result in yuv420 being chosen for the second link, which is clearly
not right.

This commit attempts to improve in the following way:
repeat until convergence:
  loop over all filters
    find input link with exactly one format
    force this format on all output links of the same type (if possible)
 2012-04-01 09:04:09 +02:00
Anton Khirnov
996f9f0c32 avfiltergraph: add an AVClass to AVFilterGraph on next major bump. 
It will be used for logging, possibly also AVOptions.
 2012-04-01 09:03:35 +02:00
Diego Biurrun
e7e19b15c7 build: Only clean the architecture subdirectory we build for. 
This allows simplifying the Makefiles; it is no longer necessary to register
arch subdirectory Makefiles, just putting them in place is enough.
 2012-03-26 13:29:03 +02:00
Alex Converse
b0f29db5c2 Mark mutable static data const where appropriate. 2012-02-21 09:47:07 -08:00
Diego Biurrun
7331b6e718 Drop some completely unnecessary av_unused attributes. 2012-02-13 19:20:53 +01:00
Janne Grunau
456d3e4fb5 yadif: specify array size outside DECLARE_ALIGNED 2012-02-09 21:28:37 +01:00
Diego Biurrun
0bba26466f cosmetics: Delete empty lines at end of file. 2012-02-09 12:26:45 +01:00
Anton Khirnov
38d5533228 pixdesc: mark pseudopaletted formats with a special flag. 
This makes it possible to dintinguish them from PAL8.

Fixes an invalid write in avpicture_layout().
 2012-02-08 21:01:31 +01:00
Andrey Utkin
e496c45d9b drawtext: add 'fix_bounds' option on coords fixing 
Before, drawtext filter deliberately altered given text coordinates if
text didn't fully fit on the picture. This breaks the use case of
scrolling large text, e.g. movie closing credits.
Add 'fix_bounds', to make it usable in such cases (by setting its value to 0).
Default behavior is not changed, and non-fitting text coords are fixed.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2012-02-06 07:57:40 +01:00
Andrey Utkin
2b43dfce36 drawtext: fix text_{w, h} expression vars 
Before, {text_,}{w,h} vars hadn't got initialized

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2012-02-06 07:52:05 +01:00
Andrey Utkin
e7f0bc8c0f drawtext: add missing braces around an if() block. 
Prevents uninitialized read.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2012-02-05 08:07:55 +01:00
Alex Converse
7181c4edee cosmetics: Remove extra newlines at EOF 2012-01-27 17:19:09 -08:00
Diego Biurrun
07a873a277 build: Automatically include architecture-specific library Makefile snippets. 2012-01-25 15:04:28 +01:00
Diego Biurrun
33ad8c3cab cosmetics: Remove some unnecessary block braces. 2012-01-25 13:14:49 +01:00
Diego Biurrun
e44c11e9fa cosmetics: Move static and inline attributes to more standard places. 
Fixes several "‘static’ is not at beginning of declaration" warnings.
 2012-01-14 17:32:36 +01:00
Anton Khirnov
3167dc9515 lavfi: move version macros to a new installed header version.h 2012-01-12 09:00:54 +01:00
Anton Khirnov
43fe6a2905 vsrc_buffer: release the buffer on uninit. 2012-01-12 08:59:00 +01:00
Anton Khirnov
5d25140f71 vsrc_buffer: error on changing frame parameters. 2012-01-10 16:47:15 +01:00
Diego Biurrun
3dc99a18d4 cosmetics: drop some pointless parentheses 2012-01-07 22:13:07 +01:00
Andrey Utkin
079688b6cb Disable annoying warning without changing behavior 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2012-01-07 12:46:57 -08:00
Diego Biurrun
d4b63054d9 cosmetics: Drop unnecessary parentheses around return values. 2011-12-30 22:18:07 +01:00
Anton Khirnov
06e8d38f2b Add minor bumps and APIchanges entries for lavc/lavfi changes. 2011-12-25 20:50:16 +01:00
Anton Khirnov
e1d9dbf2d4 lavfi: add a new function av_buffersrc_buffer(). 
It can be used to directly pass a AVFilterBufferRef to lavfi, avoiding a
memcpy.
 2011-12-25 16:18:57 +01:00
Stefano Sabatini
1c9e340d35 lavfi: add avfilter_copy_frame_props() 
avfilter_copy_frame_props() avoids code duplication and increases
robustness.
 2011-12-25 16:18:57 +01:00
Stefano Sabatini
b58dbb5b03 lavc: add a sample_aspect_ratio field to AVFrame 
The sample aspect ratio is a per-frame property, so it makes sense to
define it in AVFrame rather than in the codec/stream context.
Simplify application-level sample aspect ratio information extraction,
and allow further simplifications.
 2011-12-25 16:18:57 +01:00
Anton Khirnov
82d05e78a6 allfilters: fix type of avfilter_vsrc_buffer. 2011-12-23 08:17:22 +01:00
Anton Khirnov
196c9e5c8c lavfi: always build vsrc_buffer. 
It's a part of public API.
 2011-12-22 15:42:52 +01:00
Luca Barbato
d32eed5c73 yadif: support 10bit YUV 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2011-12-13 17:02:55 +01:00
Mans Rullgard
878dda5db1 build: move inclusion of subdir.mak to main subdir loop 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-12-13 14:26:49 +00:00
Diego Biurrun
58c42af722 doxygen: misc consistency, spelling and wording fixes 2011-12-12 23:06:23 +01:00
Anton Khirnov
cd3716b9aa Replace all uses of av_close_input_file() with avformat_close_input(). 2011-12-12 20:34:38 +01:00
Andrey Utkin
5b3265a718 lavfi: install libavfilter/vsrc_buffer.h 
It declares API necessary for filtering apps.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-12-11 19:14:09 +01:00
Luca Barbato
78212cefe1 drawtext: remove typo 
It slipped through the last two iterations.
 2011-12-07 20:40:18 +01:00
Luca Barbato
f5edfc9e92 drawtext: introduce rand(min, max) 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2011-12-07 12:11:14 +01:00
Luca Barbato
73585620b8 drawtext: introduce explicit draw/hide variable 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2011-12-07 12:11:14 +01:00
Luca Barbato
2cf74eca70 drawtext: make x and y parametric 
Introduce variables "E", "PHI", "PI", "main_w"/"W", "main_h"/"H",
"text_w"/"w", "text_h"/"h", "x", "y", "n" and "t" in line with
vf_overlay and refactor the code accordingly.
 2011-12-03 01:35:29 +01:00
Luca Barbato
ec11ff8407 drawtext: manage memory allocation better 
Call dtext_prepare_text as early as possible
Do not draw if the memory allocation failed
 2011-12-03 01:35:28 +01:00