[FFmpeg-soc] [soc]: r916 - in libavfilter: defaults.c vf_crop.c vf_vflip.c

[koorogi]

Author: koorogi
Date: Fri Aug 17 18:45:47 2007
New Revision: 916

Log:
Make default end_frame() implementation more useful.


Modified:
   libavfilter/defaults.c
   libavfilter/vf_crop.c
   libavfilter/vf_vflip.c

Modified: libavfilter/defaults.c
==============================================================================
--- libavfilter/defaults.c	(original)
+++ libavfilter/defaults.c	Fri Aug 17 18:45:47 2007
@@ -77,8 +77,10 @@ void avfilter_default_end_frame(AVFilter
     link->cur_pic = NULL;
 
     if(out) {
+        if(out->outpic) {
         avfilter_unref_pic(out->outpic);
         out->outpic = NULL;
+        }
         avfilter_end_frame(out);
     }
 }

Modified: libavfilter/vf_crop.c
==============================================================================
--- libavfilter/vf_crop.c	(original)
+++ libavfilter/vf_crop.c	Fri Aug 17 18:45:47 2007
@@ -139,13 +139,6 @@ static void start_frame(AVFilterLink *li
     avfilter_start_frame(link->dst->outputs[0], ref2);
 }
 
-static void end_frame(AVFilterLink *link)
-{
-    avfilter_unref_pic(link->cur_pic);
-    link->cur_pic = NULL;
-    avfilter_end_frame(link->dst->outputs[0]);
-}
-
 static void draw_slice(AVFilterLink *link, int y, int h)
 {
     AVFilterContext *ctx = link->dst;
@@ -178,7 +171,6 @@ AVFilter vf_crop =
                                     .type            = AV_PAD_VIDEO,
                                     .start_frame     = start_frame,
                                     .draw_slice      = draw_slice,
-                                    .end_frame       = end_frame,
                                     .query_formats   = query_in_formats,
                                     .config_props    = config_input, },
                                   { .name = NULL}},

Modified: libavfilter/vf_vflip.c
==============================================================================
--- libavfilter/vf_vflip.c	(original)
+++ libavfilter/vf_vflip.c	Fri Aug 17 18:45:47 2007
@@ -76,13 +76,6 @@ static void start_frame(AVFilterLink *li
     avfilter_start_frame(link->dst->outputs[0], ref2);
 }
 
-static void end_frame(AVFilterLink *link)
-{
-    avfilter_unref_pic(link->cur_pic);
-    link->cur_pic = NULL;
-    avfilter_end_frame(link->dst->outputs[0]);
-}
-
 static void draw_slice(AVFilterLink *link, int y, int h)
 {
     AVFilterContext *ctx = link->dst;
@@ -101,7 +94,6 @@ AVFilter vf_vflip =
                                     .type            = AV_PAD_VIDEO,
                                     .start_frame     = start_frame,
                                     .draw_slice      = draw_slice,
-                                    .end_frame       = end_frame,
                                     .query_formats   = query_in_formats,
                                     .config_props    = config_input, },
                                   { .name = NULL}},