[FFmpeg-soc] [soc]: r1928 - in libavfilter/diffs: 00_build.diff 04_ffmpeg_filters.diff

[vitor]

Author: vitor
Date: Wed Feb 27 19:18:33 2008
New Revision: 1928

Log:
Remove applied patches from diffs/

Removed:
   libavfilter/diffs/00_build.diff
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	Wed Feb 27 19:18:33 2008
@@ -1,6 +1,6 @@
 Index: ffmpeg.c
 ===================================================================
---- ffmpeg.c	(revision 11882)
+--- ffmpeg.c	(revision 11963)
 +++ ffmpeg.c	(working copy)
 @@ -36,6 +36,11 @@
  #include "avstring.h"
@@ -308,7 +308,7 @@ Index: ffmpeg.c
  static void term_exit(void)
  {
  #ifdef HAVE_TERMIOS_H
-@@ -752,6 +1030,9 @@
+@@ -754,6 +1032,9 @@
      if (nb_frames <= 0)
          return;
  
@@ -318,7 +318,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");
-@@ -761,6 +1042,7 @@
+@@ -763,6 +1044,7 @@
      } else {
          formatted_picture = in_picture;
      }
@@ -326,7 +326,7 @@ Index: ffmpeg.c
  
      final_picture = formatted_picture;
      padding_src = formatted_picture;
-@@ -776,12 +1058,14 @@
+@@ -778,12 +1060,14 @@
          }
      }
  
@@ -341,7 +341,7 @@ Index: ffmpeg.c
  
      if (ost->video_pad) {
          av_picture_pad((AVPicture*)final_picture, (AVPicture *)padding_src,
-@@ -1161,6 +1445,17 @@
+@@ -1163,6 +1447,17 @@
                                      &buffer_to_free);
          }
  
@@ -359,7 +359,7 @@ Index: ffmpeg.c
          // preprocess audio (volume)
          if (ist->st->codec->codec_type == CODEC_TYPE_AUDIO) {
              if (audio_volume != 256) {
-@@ -1223,10 +1518,23 @@
+@@ -1225,10 +1520,23 @@
                              do_audio_out(os, ost, ist, data_buf, data_size);
                              break;
                          case CODEC_TYPE_VIDEO:
@@ -383,7 +383,7 @@ Index: ffmpeg.c
                              break;
                          case CODEC_TYPE_SUBTITLE:
                              do_subtitle_out(os, ost, ist, &subtitle,
-@@ -1687,10 +1995,21 @@
+@@ -1689,10 +1997,21 @@
                          fprintf(stderr, "Cannot get resampling context\n");
                          exit(1);
                      }
@@ -415,25 +415,3 @@ Index: ffmpeg.c
      { "intra_matrix", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_intra_matrix}, "specify intra matrix coeffs", "matrix" },
      { "inter_matrix", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_inter_matrix}, "specify inter matrix coeffs", "matrix" },
      { "top", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_top_field_first}, "top=1/bottom=0/auto=-1 field first", "" },
-Index: cmdutils.c
-===================================================================
---- cmdutils.c	(revision 11882)
-+++ cmdutils.c	(working copy)
-@@ -24,6 +24,7 @@
- #include <errno.h>
- 
- #include "avformat.h"
-+#include "avfilter.h"
- #include "avdevice.h"
- #include "cmdutils.h"
- #include "avstring.h"
-@@ -164,6 +165,9 @@
-     fprintf(stderr, "  libavcodec version: " AV_STRINGIFY(LIBAVCODEC_VERSION) "\n");
-     fprintf(stderr, "  libavformat version: " AV_STRINGIFY(LIBAVFORMAT_VERSION) "\n");
-     fprintf(stderr, "  libavdevice version: " AV_STRINGIFY(LIBAVDEVICE_VERSION) "\n");
-+#if ENABLE_AVFILTER
-+    fprintf(stderr, "  libavfilter version: " AV_STRINGIFY(LIBAVFILTER_VERSION) "\n");
-+#endif
-     fprintf(stderr, "  built on " __DATE__ " " __TIME__);
- #ifdef __GNUC__
-     fprintf(stderr, ", gcc: " __VERSION__ "\n");