[FFmpeg-soc] [soc]: r2143 - libavfilter/diffs/04_ffmpeg_filters.diff

[vitor]

Author: vitor
Date: Tue Apr 22 17:33:01 2008
New Revision: 2143

Log:
Missed patch changes

Modified:
   libavfilter/diffs/04_ffmpeg_filters.diff

Modified: libavfilter/diffs/04_ffmpeg_filters.diff
==============================================================================
--- libavfilter/diffs/04_ffmpeg_filters.diff	(original)
+++ libavfilter/diffs/04_ffmpeg_filters.diff	Tue Apr 22 17:33:01 2008
@@ -39,7 +39,7 @@ Index: ffmpeg.c
  } AVInputStream;
  
  typedef struct AVInputFile {
-@@ -288,6 +304,254 @@
+@@ -288,6 +304,255 @@
  static struct termios oldtty;
  #endif
  
@@ -271,7 +271,8 @@ Index: ffmpeg.c
 +
 +    if(vfilters) {
 +        if (avfilter_parse_graph(filt_graph_all, vfilters,
-+                                 curr_filter, 0, ist->out_video_filter, 0) < 0)
++                                 curr_filter, 0,
++                                 ist->out_video_filter, 0, NULL) < 0)
 +            return -1;
 +    } else {
 +        if(avfilter_link(curr_filter, 0, ist->out_video_filter, 0) < 0)
@@ -294,7 +295,7 @@ Index: ffmpeg.c
  static void term_exit(void)
  {
  #ifdef HAVE_TERMIOS_H
-@@ -754,6 +1018,9 @@
+@@ -754,6 +1019,9 @@
      if (nb_frames <= 0)
          return;
  
@@ -304,7 +305,7 @@ Index: ffmpeg.c
      if (ost->video_crop) {
          if (av_picture_crop((AVPicture *)&picture_crop_temp, (AVPicture *)in_picture, dec->pix_fmt, ost->topBand, ost->leftBand) < 0) {
              av_log(NULL, AV_LOG_ERROR, "error cropping picture\n");
-@@ -763,6 +1030,7 @@
+@@ -763,6 +1031,7 @@
      } else {
          formatted_picture = in_picture;
      }
@@ -312,7 +313,7 @@ Index: ffmpeg.c
  
      final_picture = formatted_picture;
      padding_src = formatted_picture;
-@@ -778,12 +1046,14 @@
+@@ -778,12 +1047,14 @@
          }
      }
  
@@ -327,7 +328,7 @@ Index: ffmpeg.c
  
      if (ost->video_pad) {
          av_picture_pad((AVPicture*)final_picture, (AVPicture *)padding_src,
-@@ -1053,6 +1323,7 @@
+@@ -1053,6 +1324,7 @@
      static short *samples= NULL;
      AVSubtitle subtitle, *subtitle_to_free;
      int got_subtitle;
@@ -335,7 +336,7 @@ Index: ffmpeg.c
  
      if(ist->next_pts == AV_NOPTS_VALUE)
          ist->next_pts= ist->pts;
-@@ -1165,6 +1436,17 @@
+@@ -1165,6 +1437,17 @@
                                      &buffer_to_free);
          }
  
@@ -353,7 +354,7 @@ Index: ffmpeg.c
          // preprocess audio (volume)
          if (ist->st->codec->codec_type == CODEC_TYPE_AUDIO) {
              if (audio_volume != 256) {
-@@ -1202,9 +1484,16 @@
+@@ -1202,9 +1485,16 @@
              }
          }
  #endif
@@ -370,7 +371,7 @@ Index: ffmpeg.c
              for(i=0;i<nb_ostreams;i++) {
                  int frame_size;
  
-@@ -1227,6 +1516,9 @@
+@@ -1227,6 +1517,9 @@
                              do_audio_out(os, ost, ist, data_buf, data_size);
                              break;
                          case CODEC_TYPE_VIDEO:
@@ -380,7 +381,7 @@ Index: ffmpeg.c
                              do_video_out(os, ost, ist, &picture, &frame_size);
                              video_size += frame_size;
                              if (vstats_filename && frame_size)
-@@ -1285,7 +1577,15 @@
+@@ -1285,7 +1578,15 @@
                          av_free_packet(&opkt);
                      }
                  }
@@ -396,7 +397,7 @@ Index: ffmpeg.c
          av_free(buffer_to_free);
          /* XXX: allocate the subtitles in the codec ? */
          if (subtitle_to_free) {
-@@ -1693,10 +1993,21 @@
+@@ -1693,10 +1994,21 @@
                          fprintf(stderr, "Cannot get resampling context\n");
                          exit(1);
                      }
@@ -418,7 +419,7 @@ Index: ffmpeg.c
                  break;
              case CODEC_TYPE_SUBTITLE:
                  ost->encoding_needed = 1;
-@@ -3804,6 +4115,9 @@
+@@ -3804,6 +4116,9 @@
  #ifdef CONFIG_VHOOK
      { "vhook", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)add_frame_hooker}, "insert video processing module", "module" },
  #endif