Commit Graph

188 Commits

Author SHA1 Message Date
Baptiste Coudurier b504981483 Use default graph swscale opts when no opts are supplied
Originally committed as revision 24016 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-03 03:12:29 +00:00
Baptiste Coudurier 03c3bb5c5a use filter name when graph parser add filters
Originally committed as revision 23147 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-16 18:13:55 +00:00
Stefano Sabatini 15a316c014 Make parse_filter() parsing more robust.
Add ';' and '\n' to the terminating characters for the name of a
filter, and ';' to the terminating characters for its args.

Originally committed as revision 20800 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-11 20:02:10 +00:00
Vitor Sessak b755a754d1 "[" is a terminating char for the filter name. This fixes the parsing of
things like

[in] vflip [out];

Originally committed as revision 18772 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-08 19:14:21 +00:00
Stefano Sabatini dd04911c4e Make graphparser.c use av_get_token().
This also avoids the need for '\=' escaping.

Originally committed as revision 18726 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-01 18:17:59 +00:00
Stefano Sabatini fd548e5bd6 Remove consume_whitespace() and replace it with direct calls to
strspn().

Originally committed as revision 18645 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-21 19:08:49 +00:00
Stefano Sabatini 86a47378d5 Rename avfilter_parse_graph() to avfilter_graph_parse(), for better
consistency with the rest of the API.

Originally committed as revision 17624 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-26 22:03:55 +00:00
Stefano Sabatini d7dbe55823 Rename avfilter_destroy_graph() to avfilter_graph_destroy(), for better
consistency with the rest of the API.

Originally committed as revision 17623 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-26 22:02:09 +00:00
Stefano Sabatini fd51ff1643 Fix avfilter_parse_graph() invalid graph description detection.
See the thread:
"[FFmpeg-devel] [PATCH] Fix avfilter-parse-graph()".

Originally committed as revision 17222 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-14 11:47:42 +00:00
Stefano Sabatini 784712343c Print a warning and fail if the graph description cannot be
parsed.

Originally committed as revision 16648 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-16 23:56:53 +00:00
Stefano Sabatini 7f9b3266c9 Change thisIsAVar variable names to this_is_a_var style, more
consistent with the rest of libav*.

Originally committed as revision 16356 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-27 09:31:05 +00:00
Stefano Sabatini e916c2ac6a Fix typo: ommitted -> omitted.
Originally committed as revision 16353 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-26 20:26:44 +00:00
Stefano Sabatini e4a5f397fd Choose better names for the variables in create_filter().
Originally committed as revision 16320 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-26 10:54:16 +00:00
Vitor Sessak e2b5fdaf11 Split openLinks linked list into openInputs and openOutputs
Commited in SoC by Vitor Sessak on 2008-05-24 17:20:09

Originally committed as revision 13360 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-24 20:42:34 +00:00
Vitor Sessak 64fbf5e263 One more memory leak
Commited in SoC by Vitor Sessak on 2008-05-24 17:18:03

Originally committed as revision 13359 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-24 20:42:32 +00:00
Vitor Sessak 4d11beb293 Cosmetical: move statement
Commited in SoC by Vitor Sessak on 2008-05-24 17:17:19

Originally committed as revision 13358 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-24 20:42:29 +00:00
Vitor Sessak 64b164f44a Plug some memory leaks
Commited in SoC by Vitor Sessak on 2008-05-24 17:15:18

Originally committed as revision 13357 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-24 20:42:26 +00:00
Vitor Sessak 90ed076ce3 Merge variable initialization and declaration
Commited in SoC by Vitor Sessak on 2008-05-24 17:01:01

Originally committed as revision 13356 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-24 20:42:24 +00:00
Vitor Sessak c185fc5d72 Cosmetics
Commited in SoC by Vitor Sessak on 2008-05-24 17:00:23

Originally committed as revision 13355 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-24 20:42:21 +00:00
Vitor Sessak 5b31015a7f Remove unnused var
Commited in SoC by Vitor Sessak on 2008-05-24 16:58:58

Originally committed as revision 13354 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-24 20:42:18 +00:00
Vitor Sessak c880791fc1 Simplify
Commited in SoC by Vitor Sessak on 2008-05-24 16:55:47

Originally committed as revision 13353 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-24 20:42:16 +00:00
Vitor Sessak c956dd431f Use av_mallocz instead of av_malloc to simplify some code
Commited in SoC by Vitor Sessak on 2008-05-24 16:53:33

Originally committed as revision 13352 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-24 20:42:11 +00:00
Vitor Sessak e97908ee70 Factor linked list insertion in its own function
Commited in SoC by Vitor Sessak on 2008-05-24 13:33:17

Originally committed as revision 13351 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-24 20:42:09 +00:00
Vitor Sessak c658f47eff Remove comment redundant with those in graphparser.h
Commited in SoC by Vitor Sessak on 2008-05-24 13:10:07

Originally committed as revision 13350 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-24 20:42:04 +00:00
Vitor Sessak 089d371450 These error messages should print the filter name, not the instance name
Commited in SoC by Vitor Sessak on 2008-05-24 13:08:23

Originally committed as revision 13349 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-24 20:42:00 +00:00
Vitor Sessak 12849837d4 10l: fix previous commit
Commited in SoC by Vitor Sessak on 2008-05-24 13:06:05

Originally committed as revision 13348 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-24 20:41:57 +00:00
Vitor Sessak ba3fed2fc2 Simplify
Commited in SoC by Vitor Sessak on 2008-05-24 13:05:30

Originally committed as revision 13347 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-24 20:41:54 +00:00
Vitor Sessak 98fb286b60 Remove senseless comments
Commited in SoC by Vitor Sessak on 2008-05-24 13:03:51

Originally committed as revision 13346 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-24 20:41:51 +00:00
Vitor Sessak 5e60018545 Cosmetics: split setting a var and checking for error
Commited in SoC by Vitor Sessak on 2008-05-24 13:03:07

Originally committed as revision 13345 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-24 20:41:48 +00:00
Vitor Sessak 69fa7e80c2 Fix doxy comment
Commited in SoC by Vitor Sessak on 2008-05-24 12:57:58

Originally committed as revision 13344 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-24 20:41:45 +00:00
Vitor Sessak bd80b349b3 Make parse_link_name() return a pointer to the name read
Commited in SoC by Vitor Sessak on 2008-05-24 12:57:20

Originally committed as revision 13343 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-24 20:41:42 +00:00
Vitor Sessak f5cbde2ee1 Cosmetics: more function reordering
Commited in SoC by Vitor Sessak on 2008-05-24 12:53:28

Originally committed as revision 13342 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-24 20:41:38 +00:00
Vitor Sessak d424e138d1 Make consume_whitespace() return a number of bytes to be skiped
Commited in SoC by Vitor Sessak on 2008-05-24 12:50:32

Originally committed as revision 13341 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-24 20:41:36 +00:00
Vitor Sessak 8e74c889bc Cosmetics: change function order
Commited in SoC by Vitor Sessak on 2008-05-24 12:46:27

Originally committed as revision 13340 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-24 20:41:34 +00:00
Vitor Sessak 74c2f1fbcb Simplify
Commited in SoC by Vitor Sessak on 2008-04-23 20:46:17

Originally committed as revision 13339 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-24 20:41:31 +00:00
Vitor Sessak 6a0c770b21 Pass the inputs and outputs of avfilter_parse_graph() with a AVFilterInOut linked list
Commited in SoC by Vitor Sessak on 2008-04-23 20:40:49

Originally committed as revision 13338 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-24 20:41:27 +00:00
Vitor Sessak d835680e3c Cosmetics: more indentation consistency
Commited in SoC by Vitor Sessak on 2008-04-23 19:24:23

Originally committed as revision 13337 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-24 20:41:25 +00:00
Vitor Sessak 487c0e6700 More cosmetics: make indentation more consistent
Commited in SoC by Vitor Sessak on 2008-04-23 19:14:08

Originally committed as revision 13336 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-24 20:41:22 +00:00
Vitor Sessak d9d086d901 More cosmetics
Commited in SoC by Vitor Sessak on 2008-04-23 19:13:06

Originally committed as revision 13335 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-24 20:41:19 +00:00
Vitor Sessak eee68d96d4 Move code out of if
Commited in SoC by Vitor Sessak on 2008-04-23 19:05:32

Originally committed as revision 13334 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-24 20:41:16 +00:00
Vitor Sessak 67ba10fe56 Cosmetics
Commited in SoC by Vitor Sessak on 2008-04-23 19:00:50

Originally committed as revision 13333 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-24 20:41:13 +00:00
Vitor Sessak f6557d5e33 Cosmetics
Commited in SoC by Vitor Sessak on 2008-04-23 18:52:24

Originally committed as revision 13332 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-24 20:41:11 +00:00
Vitor Sessak 443c10ef2b Factor common code out of if
Commited in SoC by Vitor Sessak on 2008-04-23 18:41:07

Originally committed as revision 13331 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-24 20:41:09 +00:00
Vitor Sessak 7baa62108a Rename another var
Commited in SoC by Vitor Sessak on 2008-04-23 18:39:42

Originally committed as revision 13330 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-24 20:41:06 +00:00
Vitor Sessak b2ac16dab9 Rename var
Commited in SoC by Vitor Sessak on 2008-04-23 18:37:42

Originally committed as revision 13329 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-24 20:41:03 +00:00
Vitor Sessak eece0cb089 Move var declaration to where it is needed
Commited in SoC by Vitor Sessak on 2008-04-23 18:36:26

Originally committed as revision 13328 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-24 20:41:01 +00:00
Vitor Sessak 0de3407b8f Replace if(!a){B}else{C} by if(a){C}else{B}
Commited in SoC by Vitor Sessak on 2008-04-23 18:24:46

Originally committed as revision 13327 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-24 20:40:58 +00:00
Vitor Sessak 4d08be028d Remove useless assignment
Commited in SoC by Vitor Sessak on 2008-04-23 18:15:23

Originally committed as revision 13326 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-24 20:40:55 +00:00
Vitor Sessak 4fd9d074d8 Simplify while(pad){pad--; etc} to while(pad--){etc}
Commited in SoC by Vitor Sessak on 2008-04-23 18:03:27

Originally committed as revision 13325 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-24 20:40:51 +00:00
Vitor Sessak fec2e51385 Simplify extract_inout() as suggested by Michael
Commited in SoC by Vitor Sessak on 2008-04-23 18:01:31

Originally committed as revision 13324 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-24 20:40:44 +00:00
Vitor Sessak c9987633b1 Change the parser logic following Michael's review
Commited in SoC by Vitor Sessak on 2008-04-21 18:45:01

Originally committed as revision 13323 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-24 20:40:40 +00:00
Vitor Sessak 498f030583 The name field of AVFilterInOut can be declared const
Commited in SoC by Vitor Sessak on 2008-04-21 18:42:11

Originally committed as revision 13322 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-24 20:40:37 +00:00
Vitor Sessak dbec351d9f A semi-colon is also a string end
Commited in SoC by Vitor Sessak on 2008-04-21 18:40:05

Originally committed as revision 13321 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-24 20:40:35 +00:00
Vitor Sessak dd8e311e70 10l: Missed that in one of the last commits
Commited in SoC by Vitor Sessak on 2008-04-21 18:39:38

Originally committed as revision 13320 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-24 20:40:32 +00:00
Vitor Sessak cf4f7d38d0 Move code from handle_link() to the only place the function is called
Commited in SoC by Vitor Sessak on 2008-04-18 18:18:35

Originally committed as revision 13319 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-24 20:40:30 +00:00
Vitor Sessak 5cb9c725f2 Simplify
Commited in SoC by Vitor Sessak on 2008-04-18 17:57:42

Originally committed as revision 13318 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-24 20:40:26 +00:00
Vitor Sessak 3a70bb2d76 Use a user-provided context for av_log()
Commited in SoC by Vitor Sessak on 2008-04-12 14:33:41

Originally committed as revision 13317 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-24 20:40:22 +00:00
Vitor Sessak 7693be9232 Improve error handling
Commited in SoC by Vitor Sessak on 2008-04-12 14:32:13

Originally committed as revision 13316 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-24 20:40:20 +00:00
Vitor Sessak a4501887e4 Cosmetics
Commited in SoC by Vitor Sessak on 2008-04-12 14:28:40

Originally committed as revision 13315 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-24 20:40:17 +00:00
Vitor Sessak e84f0b6287 Better error handling
Commited in SoC by Vitor Sessak on 2008-04-12 14:28:30

Originally committed as revision 13314 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-24 20:40:14 +00:00
Vitor Sessak 85cb8af7a3 Simplify
Commited in SoC by Vitor Sessak on 2008-04-12 14:16:34

Originally committed as revision 13313 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-24 20:40:10 +00:00
Vitor Sessak 2b7defc7bb Link filters in the same pass as the parser
Commited in SoC by Vitor Sessak on 2008-04-12 14:12:56

Originally committed as revision 13312 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-24 20:40:08 +00:00
Vitor Sessak a59a773413 Cosmetics: if(x != NULL) -> if(x)
Commited in SoC by Vitor Sessak on 2008-04-12 14:11:19

Originally committed as revision 13311 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-24 20:40:03 +00:00
Vitor Sessak 8095a014a0 Even more improvements on whitespaces handling
Commited in SoC by Vitor Sessak on 2008-04-12 10:37:15

Originally committed as revision 13310 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-24 20:40:01 +00:00
Vitor Sessak 7a57c8d9ad More improvements on the handling of whitespaces
Commited in SoC by Vitor Sessak on 2008-04-12 10:34:48

Originally committed as revision 13309 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-24 20:39:57 +00:00
Vitor Sessak a78f2ccdd6 Proper handling of trailing whitespaces
Commited in SoC by Vitor Sessak on 2008-04-10 21:29:33

Originally committed as revision 13308 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-24 20:39:55 +00:00
Vitor Sessak a64821f4e5 Remove unneeded var
Commited in SoC by Vitor Sessak on 2008-04-10 21:26:45

Originally committed as revision 13307 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-24 20:39:51 +00:00
Vitor Sessak 89475efd26 Cosmetics: alignment
Commited in SoC by Vitor Sessak on 2008-04-10 21:10:06

Originally committed as revision 13306 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-24 20:39:48 +00:00
Vitor Sessak 03cea46194 Make two variables const
Commited in SoC by Vitor Sessak on 2008-04-10 21:06:35

Originally committed as revision 13305 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-24 20:39:45 +00:00
Vitor Sessak 22260824c0 Better error messages
Commited in SoC by Vitor Sessak on 2008-04-10 18:35:09

Originally committed as revision 13304 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-24 20:39:42 +00:00
Vitor Sessak 325cb1efb2 More simplifying
Commited in SoC by Vitor Sessak on 2008-04-10 18:26:40

Originally committed as revision 13303 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-24 20:39:39 +00:00
Vitor Sessak a3acd1d9da Simplify
Commited in SoC by Vitor Sessak on 2008-04-10 16:51:23

Originally committed as revision 13302 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-24 20:39:36 +00:00
Vitor Sessak 55672c8368 Merge declaration and initialization
Commited in SoC by Vitor Sessak on 2008-04-10 16:46:33

Originally committed as revision 13301 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-24 20:39:34 +00:00
Vitor Sessak 2839ff5e2f Cosmetics
Commited in SoC by Vitor Sessak on 2008-04-10 16:41:47

Originally committed as revision 13300 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-24 20:39:32 +00:00
Vitor Sessak ffac8784d6 Update comments to new syntax
Commited in SoC by Vitor Sessak on 2008-04-10 16:40:03

Originally committed as revision 13299 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-24 20:39:29 +00:00
Vitor Sessak 2255026d53 10l: Forgot to consider the null byte at the end of the string when alloc'ing
Commited in SoC by Vitor Sessak on 2008-04-10 16:39:07

Originally committed as revision 13298 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-24 20:39:26 +00:00
Vitor Sessak d7ff229718 Use '[' and ']' for label naming
Commited in SoC by Vitor Sessak on 2008-04-06 19:02:56

Originally committed as revision 13297 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-24 20:39:22 +00:00
Vitor Sessak 92973a04f0 Rename avfilter_graph_parse_chain() to avfilter_parse_graph()
Commited in SoC by Vitor Sessak on 2008-04-06 18:58:17

Originally committed as revision 13296 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-24 20:39:19 +00:00
Vitor Sessak 37161d641e Rename AVFilterInOut.instance to AVFilterInOut.filter
Commited in SoC by Vitor Sessak on 2008-04-06 18:45:08

Originally committed as revision 13295 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-24 20:39:16 +00:00
Vitor Sessak da790674c5 Cosmetics
Commited in SoC by Vitor Sessak on 2008-04-06 18:43:29

Originally committed as revision 13294 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-24 20:39:14 +00:00
Vitor Sessak 93b7a0f68d Simplify consume_string() as Michael suggested
Commited in SoC by Vitor Sessak on 2008-04-06 18:43:02

Originally committed as revision 13293 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-24 20:39:12 +00:00
Vitor Sessak 5b2bb2c906 Simplify
Commited in SoC by Vitor Sessak on 2008-04-06 18:20:25

Originally committed as revision 13292 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-24 20:39:09 +00:00
Vitor Sessak 58a2d7a5c2 Better instance name for parsed filters
Commited in SoC by Vitor Sessak on 2008-04-06 18:19:09

Originally committed as revision 13291 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-24 20:39:05 +00:00
Vitor Sessak ee75692a5f Use link_filter() instead avfilter_link() when clearer
Commited in SoC by Vitor Sessak on 2008-04-06 18:17:29

Originally committed as revision 13290 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-24 20:39:03 +00:00
Vitor Sessak 9710beaf14 Avoid searching by instance name when it is not necessary
Commited in SoC by Vitor Sessak on 2008-04-06 18:00:58

Originally committed as revision 13289 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-24 20:38:25 +00:00
Vitor Sessak 27a669ab00 Better error messages
Commited in SoC by Vitor Sessak on 2008-04-06 11:09:29

Originally committed as revision 13288 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-24 20:38:23 +00:00
Vitor Sessak 046f49baa2 Handle av_realloc() failure
Commited in SoC by Vitor Sessak on 2008-04-04 15:35:38

Originally committed as revision 13287 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-24 20:38:15 +00:00
Vitor Sessak 27afb09d51 I should not have merged the graph parser with the graph
framework. Split it.

Commited in SoC by Vitor Sessak on 2008-04-03 16:29:07

Originally committed as revision 13285 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-24 20:35:43 +00:00