[FFmpeg-soc] [soc]: r3889 - in libavfilter: checkout.sh diffs/01_ffplay_filters.diff diffs/02_ffmpeg_filters.diff

[stefano]

Author: stefano
Date: Tue Dec 16 22:24:10 2008
New Revision: 3889

Log:
Update to FFmpeg revision 16172.


Modified:
   libavfilter/checkout.sh
   libavfilter/diffs/01_ffplay_filters.diff
   libavfilter/diffs/02_ffmpeg_filters.diff

Modified: libavfilter/checkout.sh
==============================================================================
--- libavfilter/checkout.sh	(original)
+++ libavfilter/checkout.sh	Tue Dec 16 22:24:10 2008
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 echo "checking out pristine ffmpeg"
-svn checkout svn://svn.mplayerhq.hu/ffmpeg/trunk/ ffmpeg -r15585
+svn checkout svn://svn.mplayerhq.hu/ffmpeg/trunk/ ffmpeg -r16172
 
 echo "patching ffmpeg"
 for diff in $(ls $(pwd)/diffs/*.diff); do patch -d ffmpeg -p0 -i $diff; done

Modified: libavfilter/diffs/01_ffplay_filters.diff
==============================================================================
--- libavfilter/diffs/01_ffplay_filters.diff	(original)
+++ libavfilter/diffs/01_ffplay_filters.diff	Tue Dec 16 22:24:10 2008
@@ -1,6 +1,6 @@
 Index: ffplay.c
 ===================================================================
---- ffplay.c	(revision 15585)
+--- ffplay.c	(revision 16172)
 +++ ffplay.c	(working copy)
 @@ -29,6 +29,12 @@
  #include "libavcodec/audioconvert.h"

Modified: libavfilter/diffs/02_ffmpeg_filters.diff
==============================================================================
--- libavfilter/diffs/02_ffmpeg_filters.diff	(original)
+++ libavfilter/diffs/02_ffmpeg_filters.diff	Tue Dec 16 22:24:10 2008
@@ -1,6 +1,6 @@
 Index: ffmpeg.c
 ===================================================================
---- ffmpeg.c	(revision 15585)
+--- ffmpeg.c	(revision 16172)
 +++ ffmpeg.c	(working copy)
 @@ -41,6 +41,13 @@
  #include "libavutil/avstring.h"
@@ -16,7 +16,7 @@ Index: ffmpeg.c
  #ifdef HAVE_SYS_RESOURCE_H
  #include <sys/types.h>
  #include <sys/resource.h>
-@@ -144,6 +151,9 @@
+@@ -148,6 +155,9 @@
  static int loop_input = 0;
  static int loop_output = AVFMT_NOOUTPUTLOOP;
  static int qp_hist = 0;
@@ -26,7 +26,7 @@ Index: ffmpeg.c
  
  static int intra_only = 0;
  static int audio_sample_rate = 44100;
-@@ -281,6 +291,13 @@
+@@ -285,6 +295,13 @@
                                  is not defined */
      int64_t       pts;       /* current pts */
      int is_start;            /* is 1 at the start and after a discontinuity */
@@ -40,7 +40,7 @@ Index: ffmpeg.c
  } AVInputStream;
  
  typedef struct AVInputFile {
-@@ -296,6 +313,174 @@
+@@ -300,6 +317,174 @@
  static struct termios oldtty;
  #endif
  
@@ -215,7 +215,7 @@ Index: ffmpeg.c
  static void term_exit(void)
  {
  #ifdef HAVE_TERMIOS_H
-@@ -865,6 +1050,9 @@
+@@ -869,6 +1054,9 @@
      if (nb_frames <= 0)
          return;
  
@@ -225,7 +225,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");
-@@ -876,6 +1064,7 @@
+@@ -880,6 +1068,7 @@
      } else {
          formatted_picture = in_picture;
      }
@@ -233,7 +233,7 @@ Index: ffmpeg.c
  
      final_picture = formatted_picture;
      padding_src = formatted_picture;
-@@ -893,12 +1082,14 @@
+@@ -897,12 +1086,14 @@
          }
      }
  
@@ -248,7 +248,7 @@ Index: ffmpeg.c
  
      if (ost->video_pad) {
          av_picture_pad((AVPicture*)final_picture, (AVPicture *)padding_src,
-@@ -1169,6 +1360,7 @@
+@@ -1173,6 +1364,7 @@
      static short *samples= NULL;
      AVSubtitle subtitle, *subtitle_to_free;
      int got_subtitle;
@@ -256,7 +256,7 @@ Index: ffmpeg.c
  
      if(ist->next_pts == AV_NOPTS_VALUE)
          ist->next_pts= ist->pts;
-@@ -1286,6 +1478,15 @@
+@@ -1290,6 +1482,15 @@
                                      &buffer_to_free);
          }
  
@@ -272,9 +272,9 @@ Index: ffmpeg.c
          // preprocess audio (volume)
          if (ist->st->codec->codec_type == CODEC_TYPE_AUDIO) {
              if (audio_volume != 256) {
-@@ -1309,10 +1510,16 @@
- 
-             ist->frame++;
+@@ -1311,10 +1512,16 @@
+             if (pts > now)
+                 usleep(pts - now);
          }
 -
 +        loop = ist->st->codec->codec_type != CODEC_TYPE_VIDEO ||
@@ -290,7 +290,7 @@ Index: ffmpeg.c
              for(i=0;i<nb_ostreams;i++) {
                  int frame_size;
  
-@@ -1335,6 +1542,9 @@
+@@ -1337,6 +1544,9 @@
                              do_audio_out(os, ost, ist, data_buf, data_size);
                              break;
                          case CODEC_TYPE_VIDEO:
@@ -300,7 +300,7 @@ Index: ffmpeg.c
                              do_video_out(os, ost, ist, &picture, &frame_size);
                              if (vstats_filename && frame_size)
                                  do_video_stats(os, ost, frame_size);
-@@ -1392,7 +1602,15 @@
+@@ -1394,7 +1604,15 @@
                          av_free_packet(&opkt);
                      }
                  }
@@ -316,7 +316,7 @@ Index: ffmpeg.c
          av_free(buffer_to_free);
          /* XXX: allocate the subtitles in the codec ? */
          if (subtitle_to_free) {
-@@ -1810,10 +2028,21 @@
+@@ -1814,10 +2032,21 @@
                          fprintf(stderr, "Cannot get resampling context\n");
                          av_exit(1);
                      }
@@ -338,7 +338,7 @@ Index: ffmpeg.c
                  break;
              case CODEC_TYPE_SUBTITLE:
                  ost->encoding_needed = 1;
-@@ -3777,6 +4006,9 @@
+@@ -3804,6 +4033,9 @@
  #ifdef CONFIG_VHOOK
      { "vhook", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)add_frame_hooker}, "insert video processing module", "module" },
  #endif