[FFmpeg-soc] [soc]: r2101 - in libavfilter: diffs/03_ffplay_filters.diff diffs/04_ffmpeg_filters.diff graphparser.c graphparser.h

[vitor]

Author: vitor
Date: Sun Apr  6 20:58:17 2008
New Revision: 2101

Log:
Cosmetics: break long line

Modified:
   libavfilter/diffs/03_ffplay_filters.diff
   libavfilter/diffs/04_ffmpeg_filters.diff
   libavfilter/graphparser.c
   libavfilter/graphparser.h

Modified: libavfilter/diffs/03_ffplay_filters.diff
==============================================================================
--- libavfilter/diffs/03_ffplay_filters.diff	(original)
+++ libavfilter/diffs/03_ffplay_filters.diff	Sun Apr  6 20:58:17 2008
@@ -341,8 +341,8 @@
 +
 +
 +    if(vfilters) {
-+        avfilter_graph_parse_chain(graph, vfilters,
-+                              filt_src, 0, filt_out, 0);
++        if (avfilter_parse_graph(graph, vfilters,
++                                 filt_src, 0, filt_out, 0) < 0) goto the_end;
 +    } else {
 +        if(avfilter_link(filt_src, 0, filt_out, 0) < 0)          goto the_end;
 +    }

Modified: libavfilter/diffs/04_ffmpeg_filters.diff
==============================================================================
--- libavfilter/diffs/04_ffmpeg_filters.diff	(original)
+++ libavfilter/diffs/04_ffmpeg_filters.diff	Sun Apr  6 20:58:17 2008
@@ -270,8 +270,8 @@ Index: ffmpeg.c
 +    }
 +
 +    if(vfilters) {
-+        if (avfilter_graph_parse_chain(filt_graph_all, vfilters,
-+                              curr_filter, 0, ist->out_video_filter, 0) < 0)
++        if (avfilter_parse_graph(filt_graph_all, vfilters,
++                                 curr_filter, 0, ist->out_video_filter, 0) < 0)
 +            return -1;
 +    } else {
 +        if(avfilter_link(curr_filter, 0, ist->out_video_filter, 0) < 0)

Modified: libavfilter/graphparser.c
==============================================================================
--- libavfilter/graphparser.c	(original)
+++ libavfilter/graphparser.c	Sun Apr  6 20:58:17 2008
@@ -236,7 +236,9 @@ static const char *skip_inouts(const cha
 /**
  * Parse a string describing a filter graph.
  */
-int avfilter_graph_parse_chain(AVFilterGraph *graph, const char *filters, AVFilterContext *in, int inpad, AVFilterContext *out, int outpad)
+int avfilter_parse_graph(AVFilterGraph *graph, const char *filters,
+                         AVFilterContext *in, int inpad,
+                         AVFilterContext *out, int outpad)
 {
     AVFilterInOut *inout=NULL;
     AVFilterInOut  *head=NULL;

Modified: libavfilter/graphparser.h
==============================================================================
--- libavfilter/graphparser.h	(original)
+++ libavfilter/graphparser.h	Sun Apr  6 20:58:17 2008
@@ -35,6 +35,6 @@
  * @param inpad   pad index of the output
  * @return        zero on success, -1 on error
  */
-int avfilter_graph_parse_chain(AVFilterGraph *graph, const char *filters, AVFilterContext *in, int inpad, AVFilterContext *out, int outpad);
+int avfilter_parse_graph(AVFilterGraph *graph, const char *filters, AVFilterContext *in, int inpad, AVFilterContext *out, int outpad);
 
 #endif  /* FFMPEG_GRAPHPARSER_H */