rtp and rtsp demuxer declarations are not part of public API
[ffmpeg.git] / vhook / ppm.c
index 51badd5..db76998 100644 (file)
@@ -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 );
@@ -81,7 +82,7 @@ static rwpipe *rwpipe_open( int argc, char *argv[] )
             close( output[ 1 ] );
 
             execl("/bin/sh", "sh", "-c", command, (char*)NULL );
-            exit( 255 );
+            _exit( 255 );
         }
         else
         {
@@ -266,7 +267,7 @@ void Process(void *ctx, AVPicture *picture, enum PixelFormat pix_fmt, int width,
             if (ci->toRGB_convert_ctx == NULL) {
                 av_log(NULL, AV_LOG_ERROR,
                        "Cannot initialize the toRGB conversion context\n");
-                exit(1);
+                return;
             }
 
 // img_convert parameters are          2 first destination, then 4 source
@@ -335,7 +336,7 @@ void Process(void *ctx, AVPicture *picture, enum PixelFormat pix_fmt, int width,
         if (ci->fromRGB_convert_ctx == NULL) {
             av_log(NULL, AV_LOG_ERROR,
                    "Cannot initialize the fromRGB conversion context\n");
-            exit(1);
+            return;
         }
 
 // img_convert parameters are          2 first destination, then 4 source