[FFmpeg-cvslog] doc/texi2pod: fix @ref substitution rule, disallow "}" within the fields

Stefano Sabatini git at videolan.org
Wed Aug 28 01:42:03 CEST 2013


ffmpeg | branch: release/0.11 | Stefano Sabatini <stefasab at gmail.com> | Thu Mar  7 01:43:39 2013 +0100| [bdeb7b6176e8f420f56e087f7a35d9e95dd7dea0] | committer: Timothy Gu

doc/texi2pod: fix @ref substitution rule, disallow "}" within the fields

Fix potential spurious substitution.
(cherry picked from commit 9167db3829f360f241255d4240ba6b7135ab4111)

Signed-off-by: Timothy Gu <timothygu99 at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bdeb7b6176e8f420f56e087f7a35d9e95dd7dea0
---

 doc/texi2pod.pl |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/texi2pod.pl b/doc/texi2pod.pl
index 8e09c09..20ca764 100755
--- a/doc/texi2pod.pl
+++ b/doc/texi2pod.pl
@@ -372,7 +372,7 @@ sub postprocess
     s/\(?\@xref\{(?:[^\}]*)\}(?:[^.<]|(?:<[^<>]*>))*\.\)?//g;
     s/\s+\(\@pxref\{(?:[^\}]*)\}\)//g;
     s/;\s+\@pxref\{(?:[^\}]*)\}//g;
-    s/\@ref\{(?:[^,]*,)(?:[^,]*,)([^,\}]*).*\}/$1/g;
+    s/\@ref\{(?:[^,\}]*,)(?:[^,\}]*,)([^,\}]*).*\}/$1/g;
     s/\@ref\{([^\}]*)\}/$1/g;
     s/\@noindent\s*//g;
     s/\@refill//g;



More information about the ffmpeg-cvslog mailing list