Merge commit '38c1466ca41c73c7ce347da702362cb69c151716'

* commit '38c1466ca41c73c7ce347da702362cb69c151716': dict: add av_dict_parse_string() doc: support multitable in texi2pod Conflicts: doc/APIchanges libavutil/version.h

Michael Niedermayer committed 13 years ago

Commit e7e14bc2 parents 25c7552 38c14665 files · +87 −3Browse files

Unified · Split

5 files

doc/APIchanges +4 −0
doc/texi2pod.pl +18 −2
libavutil/dict.c +47 −0
libavutil/dict.h +17 −0
libavutil/version.h +1 −1

doc/APIchanges+4−0

@@ -138,6 +138,10 @@ API changes, most recent first: · 137 unmodified lines
138	2012-03-26 - a67d9cf - lavfi 2.66.100	138	2012-03-26 - a67d9cf - lavfi 2.66.100
139	Add avfilter_fill_frame_from_{audio_,}buffer_ref() functions.	139	Add avfilter_fill_frame_from_{audio_,}buffer_ref() functions.
140		140
		141	2013-xx-xx - xxxxxxx - lavu 52.7.0 - dict.h
		142	Add av_dict_parse_string() to set multiple key/value pairs at once from a
		143	string.
		144
141	2013-01-xx - xxxxxxx - lavu 52.6.0 - avstring.h	145	2013-01-xx - xxxxxxx - lavu 52.6.0 - avstring.h
142	Add av_strnstr()	146	Add av_strnstr()
143		147

doc/texi2pod.pl+18−2

         } elsif ($ended =~ /^(?:example|smallexample|display)$/) {
             $shift = "";
             $_ = "";        # need a paragraph break
-        } elsif ($ended =~ /^(?:itemize|enumerate|[fv]?table)$/) {
+        } elsif ($ended =~ /^(?:itemize|enumerate|(?:multi|[fv])?table)$/) {
             $_ = "\n=back\n";
             $ic = pop @icstack;
         } else {
         $endw = "enumerate";
     };
-    /^\@([fv]?table)\s+(\@[a-z]+)/ and do {
+    /^\@((?:multi|[fv])?table)\s+(\@[a-z]+)/ and do {
         push @endwstack, $endw;
         push @icstack, $ic;
         $endw = $1;
         $ic =~ s/\@(?:code|kbd)/C/;
         $ic =~ s/\@(?:dfn|var|emph|cite|i)/I/;
         $ic =~ s/\@(?:file)/F/;
+        $ic =~ s/\@(?:columnfractions)//;
         $_ = "\n=over 4\n";
     };
         $_ = "";        # need a paragraph break
     };
+    /^\@item\s+(.*\S)\s*$/ and $endw eq "multitable" and do {
+        my $columns = $1;
+        $columns =~ s/\@tab/ : /;
+        $_ = "\n=item B&LT;". $columns ."&GT;\n";
+    };
+    /^\@tab\s+(.*\S)\s*$/ and $endw eq "multitable" and do {
+        my $columns = $1;
+        $columns =~ s/\@tab/ : /;
+        $_ = " : ". $columns;
+        $section =~ s/\n+\s+$//;
+    };
     /^\@itemx?\s*(.+)?$/ and do {
         if (defined $1) {
             # Entity escapes prevent munging by the <> processing below.

libavutil/dict.c+47−0

@@ -110,6 +110,53 @@ int av_dict_set(AVDictionary *pm, const char key, const char *value, int flags · 109 unmodified lines
110	return 0;	110	return 0;
111	}	111	}
112		112
		113	static int parse_key_value_pair(AVDictionary pm, const char buf,
		114	const char key_val_sep, const char pairs_sep,
		115	int flags)
		116	{
		117	char *key = av_get_token(buf, key_val_sep);
		118	char *val = NULL;
		119	int ret;
		120
		121	if (key && key && strspn(buf, key_val_sep)) {
		122	(*buf)++;
		123	val = av_get_token(buf, pairs_sep);
		124	}
		125
		126	if (key && key && val && val)
		127	ret = av_dict_set(pm, key, val, flags);
		128	else
		129	ret = AVERROR(EINVAL);
		130
		131	av_freep(&key);
		132	av_freep(&val);
		133
		134	return ret;
		135	}
		136
		137	int av_dict_parse_string(AVDictionary *pm, const char str,
		138	const char key_val_sep, const char pairs_sep,
		139	int flags)
		140	{
		141	int ret;
		142
		143	if (!str)
		144	return 0;
		145
		146	/* ignore STRDUP flags */
		147	flags &= ~(AV_DICT_DONT_STRDUP_KEY \| AV_DICT_DONT_STRDUP_VAL);
		148
		149	while (*str) {
		150	if ((ret = parse_key_value_pair(pm, &str, key_val_sep, pairs_sep, flags)) < 0)
		151	return ret;
		152
		153	if (*str)
		154	str++;
		155	}
		156
		157	return 0;
		158	}
		159
113	void av_dict_free(AVDictionary **pm)	160	void av_dict_free(AVDictionary **pm)
114	{	161	{
115	AVDictionary m = pm;	162	AVDictionary m = pm;

libavutil/dict.h+17−0

@@ -112,6 +112,23 @@ int av_dict_count(const AVDictionary *m); · 111 unmodified lines
112	*/	112	*/
113	int av_dict_set(AVDictionary *pm, const char key, const char *value, int flags);	113	int av_dict_set(AVDictionary *pm, const char key, const char *value, int flags);
114		114
		115	/**
		116	* Parse the key/value pairs list and add to a dictionary.
		117	*
		118	* @param key_val_sep a 0-terminated list of characters used to separate
		119	* key from value
		120	* @param pairs_sep a 0-terminated list of characters used to separate
		121	* two pairs from each other
		122	* @param flags flags to use when adding to dictionary.
		123	* AV_DICT_DONT_STRDUP_KEY and AV_DICT_DONT_STRDUP_VAL
		124	* are ignored since the key/value tokens will always
		125	* be duplicated.
		126	* @return 0 on success, negative AVERROR code on failure
		127	*/
		128	int av_dict_parse_string(AVDictionary *pm, const char str,
		129	const char key_val_sep, const char pairs_sep,
		130	int flags);
		131
115	/**	132	/**
116	* Copy entries from one AVDictionary struct into another.	133	* Copy entries from one AVDictionary struct into another.
117	* @param dst pointer to a pointer to a AVDictionary struct. If *dst is NULL,	134	* @param dst pointer to a pointer to a AVDictionary struct. If *dst is NULL,

libavutil/version.h+1−1

@@ -75,7 +75,7 @@ · 74 unmodified lines
75	*/	75	*/
76		76
77	#define LIBAVUTIL_VERSION_MAJOR 52	77	#define LIBAVUTIL_VERSION_MAJOR 52
78	#define LIBAVUTIL_VERSION_MINOR 16	78	#define LIBAVUTIL_VERSION_MINOR 17
79	#define LIBAVUTIL_VERSION_MICRO 100	79	#define LIBAVUTIL_VERSION_MICRO 100
80		80
81	#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \	81	#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \

Merge commit '38c1466ca41c73c7ce347da702362cb69c151716'

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code