rtp and rtsp demuxer declarations are not part of public API

[ffmpeg.git] / vhook / watermark.c

diff --git a/vhook/watermark.c b/vhook/watermark.c
index db9092f..a8f7d57 100644 (file)
--- a/vhook/watermark.c
+++ b/vhook/watermark.c
@@ -224,7 +224,7 @@ static void Process0(void *ctx,
         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
@@ -299,7 +299,7 @@ static void Process0(void *ctx,
         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
 // sws_scale   parameters are context, 4 first source,      then 2 destination
@@ -355,7 +355,7 @@ static void Process1(void *ctx,
         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
@@ -410,7 +410,7 @@ static void Process1(void *ctx,
         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
 // sws_scale   parameters are context, 4 first source,      then 2 destination
@@ -435,9 +435,9 @@ void Process(void *ctx,
 {
     ContextInfo *ci = (ContextInfo *) ctx;
     if (1 == ci->mode) {
-        return Process1(ctx, picture, pix_fmt, src_width, src_height, pts);
+        Process1(ctx, picture, pix_fmt, src_width, src_height, pts);
     } else {
-        return Process0(ctx, picture, pix_fmt, src_width, src_height, pts);
+        Process0(ctx, picture, pix_fmt, src_width, src_height, pts);
     }
 }
 
@@ -544,10 +544,6 @@ int get_watermark_picture(ContextInfo *ci, int cleanup)
             return -1;
         }
 
-        // Inform the codec that we can handle truncated bitstreams -- i.e.,
-        // bitstreams where frame boundaries can fall in the middle of packets
-        if (ci->pCodec->capabilities & CODEC_CAP_TRUNCATED)
-            ci->pCodecCtx->flags|=CODEC_FLAG_TRUNCATED;
 
         // Open codec
         if(avcodec_open(ci->pCodecCtx, ci->pCodec)<0) {
@@ -610,7 +606,7 @@ int get_watermark_picture(ContextInfo *ci, int cleanup)
                     if (ci->watermark_convert_ctx == NULL) {
                         av_log(NULL, AV_LOG_ERROR,
                               "Cannot initialize the watermark conversion context\n");
-                        exit(1);
+                        return -1;
                     }
 // img_convert parameters are          2 first destination, then 4 source
 // sws_scale   parameters are context, 4 first source,      then 2 destination