[SCM] libav/experimental: more av_strl* adjustments

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 272605c73e02ff4e847e103ad3bd3161d7212949
Author: Reimar Döffinger <Reimar.Doeffinger at gmx.de>
Date:   Sun Jun 24 12:23:34 2007 +0000

    more av_strl* adjustments
    
    Originally committed as revision 9412 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/rtpproto.c b/libavformat/rtpproto.c
index f56b63f..3708a90 100644
--- a/libavformat/rtpproto.c
+++ b/libavformat/rtpproto.c
@@ -25,6 +25,7 @@
 #include <stdarg.h>
 #include "network.h"
 #include <fcntl.h>
+#include "avstring.h"
 
 #define RTP_TX_BUF_SIZE  (64 * 1024)
 #define RTP_RX_BUF_SIZE  (128 * 1024)
diff --git a/libavutil/internal.h b/libavutil/internal.h
index 7a97f54..75e8bf3 100644
--- a/libavutil/internal.h
+++ b/libavutil/internal.h
@@ -241,7 +241,7 @@ if((y)<(x)){\
 #define rand rand_is_forbidden_due_to_state_trashing
 #define srand srand_is_forbidden_due_to_state_trashing
 #define sprintf sprintf_is_forbidden_due_to_security_issues_use_snprintf
-#define strcat strcat_is_forbidden_due_to_security_issues_use_pstrcat
+#define strcat strcat_is_forbidden_due_to_security_issues_use_av_strlcat
 #define exit exit_is_forbidden
 #if !(defined(LIBAVFORMAT_BUILD) || defined(_FRAMEHOOK_H))
 #define printf please_use_av_log
diff --git a/vhook/ppm.c b/vhook/ppm.c
index 9f618e5..db76998 100644
--- a/vhook/ppm.c
+++ b/vhook/ppm.c
@@ -28,6 +28,7 @@
 #include "framehook.h"
 #include "avformat.h"
 #include "swscale.h"
+#include "avstring.h"
 
 static int sws_flags = SWS_BICUBIC;
 
@@ -68,8 +69,8 @@ static rwpipe *rwpipe_open( int argc, char *argv[] )
             strcpy( command, "" );
             for ( i = 0; i < argc; i ++ )
             {
-                pstrcat( command, COMMAND_SIZE, argv[ i ] );
-                pstrcat( command, COMMAND_SIZE, " " );
+                av_strlcat( command, argv[ i ], COMMAND_SIZE );
+                av_strlcat( command, " ", COMMAND_SIZE );
             }
 
             dup2( output[ 0 ], STDIN_FILENO );

-- 
Libav/FFmpeg packaging