[FFmpeg-cvslog] ass_split: Do not use the function name as a parameter name in a declaration.

Carl Eugen Hoyos git at videolan.org
Wed Apr 17 00:54:22 CEST 2013


ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Wed Apr 17 00:35:00 2013 +0200| [9802f56684fe1cda5b42b76deb83d6a06a42d07d] | committer: Carl Eugen Hoyos

ass_split: Do not use the function name as a parameter name in a declaration.

Fixes compilation of srtenc.o with PGC 13.4-0.

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

 libavcodec/ass_split.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/ass_split.h b/libavcodec/ass_split.h
index 7a6a75e..06c1ce3 100644
--- a/libavcodec/ass_split.h
+++ b/libavcodec/ass_split.h
@@ -124,7 +124,7 @@ typedef struct {
     void (*text)(void *priv, const char *text, int len);
     void (*new_line)(void *priv, int forced);
     void (*style)(void *priv, char style, int close);
-    void (*color)(void *priv, unsigned int color, unsigned int color_id);
+    void (*color)(void *priv, unsigned int /* color */, unsigned int color_id);
     void (*alpha)(void *priv, int alpha, int alpha_id);
     void (*font_name)(void *priv, const char *name);
     void (*font_size)(void *priv, int size);



More information about the ffmpeg-cvslog mailing list