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

[vitor]

Author: vitor
Date: Sat Feb  9 17:19:18 2008
New Revision: 1869

Log:
Make ffmpeg.c honors the filtered aspect rate

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	Sat Feb  9 17:19:18 2008
@@ -1,6 +1,6 @@
 Index: ffmpeg.c
 ===================================================================
---- ffmpeg.c	(revision 11293)
+--- ffmpeg.c	(revision 11882)
 +++ ffmpeg.c	(working copy)
 @@ -36,6 +36,11 @@
  #include "avstring.h"
@@ -24,7 +24,7 @@ Index: ffmpeg.c
  
  static int intra_only = 0;
  static int audio_sample_rate = 44100;
-@@ -275,6 +283,13 @@
+@@ -277,6 +285,13 @@
                                  is not defined */
      int64_t       pts;       /* current pts */
      int is_start;            /* is 1 at the start and after a discontinuity */
@@ -38,7 +38,7 @@ Index: ffmpeg.c
  } AVInputStream;
  
  typedef struct AVInputFile {
-@@ -290,6 +305,271 @@
+@@ -292,6 +307,271 @@
  static struct termios oldtty;
  #endif
  
@@ -310,7 +310,7 @@ Index: ffmpeg.c
  static void term_exit(void)
  {
  #ifdef HAVE_TERMIOS_H
-@@ -745,6 +1025,9 @@
+@@ -752,6 +1032,9 @@
      if (nb_frames <= 0)
          return;
  
@@ -320,7 +320,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");
-@@ -754,6 +1037,7 @@
+@@ -761,6 +1044,7 @@
      } else {
          formatted_picture = in_picture;
      }
@@ -328,7 +328,7 @@ Index: ffmpeg.c
  
      final_picture = formatted_picture;
      padding_src = formatted_picture;
-@@ -769,12 +1053,14 @@
+@@ -776,12 +1060,14 @@
          }
      }
  
@@ -343,7 +343,7 @@ Index: ffmpeg.c
  
      if (ost->video_pad) {
          av_picture_pad((AVPicture*)final_picture, (AVPicture *)padding_src,
-@@ -1154,6 +1440,17 @@
+@@ -1161,6 +1447,17 @@
                                      &buffer_to_free);
          }
  
@@ -361,13 +361,14 @@ Index: ffmpeg.c
          // preprocess audio (volume)
          if (ist->st->codec->codec_type == CODEC_TYPE_AUDIO) {
              if (audio_volume != 256) {
-@@ -1216,10 +1513,22 @@
+@@ -1223,10 +1520,23 @@
                              do_audio_out(os, ost, ist, data_buf, data_size);
                              break;
                          case CODEC_TYPE_VIDEO:
 +#if ENABLE_AVFILTER
 +                            while(avfilter_poll_frame(ist->out_video_filter->inputs[0])) {
 +                                get_filtered_video_pic(ist->out_video_filter, &ist->picref, &picture, &ist->pts);
++                                ost->st->codec->sample_aspect_ratio = ist->picref->pixel_aspect;
 +                                do_video_out(os, ost, ist, &picture, &frame_size);
 +                                video_size += frame_size;
 +                                if (vstats_filename && frame_size)
@@ -384,7 +385,7 @@ Index: ffmpeg.c
                              break;
                          case CODEC_TYPE_SUBTITLE:
                              do_subtitle_out(os, ost, ist, &subtitle,
-@@ -1680,10 +1989,21 @@
+@@ -1687,10 +1997,21 @@
                          fprintf(stderr, "Cannot get resampling context\n");
                          exit(1);
                      }
@@ -406,7 +407,7 @@ Index: ffmpeg.c
                  break;
              case CODEC_TYPE_SUBTITLE:
                  ost->encoding_needed = 1;
-@@ -3782,6 +4102,9 @@
+@@ -3803,6 +4124,9 @@
  #ifdef CONFIG_VHOOK
      { "vhook", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)add_frame_hooker}, "insert video processing module", "module" },
  #endif