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

stefano subversion at mplayerhq.hu
Wed Dec 16 13:24:29 CET 2009


Author: stefano
Date: Wed Dec 16 13:24:29 2009
New Revision: 5542

Log:
Update to FFmpeg r20880 / libswscale r29978.

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

Modified: libavfilter/checkout.sh
==============================================================================
--- libavfilter/checkout.sh	Wed Dec 16 00:15:11 2009	(r5541)
+++ libavfilter/checkout.sh	Wed Dec 16 13:24:29 2009	(r5542)
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 echo "checking out pristine ffmpeg"
-svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r20790
+svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r20880
 
 echo "downloading the corresponding version of swscale"
 cd ffmpeg/libswscale

Modified: libavfilter/diffs/01_ffplay_filters.diff
==============================================================================
--- libavfilter/diffs/01_ffplay_filters.diff	Wed Dec 16 00:15:11 2009	(r5541)
+++ libavfilter/diffs/01_ffplay_filters.diff	Wed Dec 16 13:24:29 2009	(r5542)
@@ -1,6 +1,6 @@
 Index: ffplay.c
 ===================================================================
---- ffplay.c	(revision 20790)
+--- ffplay.c	(revision 20880)
 +++ ffplay.c	(working copy)
 @@ -30,6 +30,12 @@
  #include "libavcodec/colorspace.h"
@@ -15,7 +15,7 @@ Index: ffplay.c
  #include "cmdutils.h"
  
  #include <SDL.h>
-@@ -68,7 +74,9 @@
+@@ -70,7 +76,9 @@
  /* NOTE: the size must be big enough to compensate the hardware audio buffersize size */
  #define SAMPLE_ARRAY_SIZE (2*65536)
  
@@ -25,7 +25,7 @@ Index: ffplay.c
  
  typedef struct PacketQueue {
      AVPacketList *first_pkt, *last_pkt;
-@@ -86,7 +94,12 @@
+@@ -88,7 +96,12 @@
      double pts;                                  ///<presentation time stamp for this picture
      SDL_Overlay *bmp;
      int width, height; /* source height & width */
@@ -38,7 +38,7 @@ Index: ffplay.c
  } VideoPicture;
  
  typedef struct SubPicture {
-@@ -169,11 +182,17 @@
+@@ -171,11 +184,17 @@
      int pictq_size, pictq_rindex, pictq_windex;
      SDL_mutex *pictq_mutex;
      SDL_cond *pictq_cond;
@@ -56,7 +56,7 @@ Index: ffplay.c
  } VideoState;
  
  static void show_help(void);
-@@ -214,6 +233,9 @@
+@@ -216,6 +235,9 @@
  static int error_recognition = FF_ER_CAREFUL;
  static int error_concealment = 3;
  static int decoder_reorder_pts= 0;
@@ -66,7 +66,7 @@ Index: ffplay.c
  
  /* current context */
  static int is_full_screen;
-@@ -645,6 +667,13 @@
+@@ -647,6 +669,13 @@
  
      vp = &is->pictq[is->pictq_rindex];
      if (vp->bmp) {
@@ -80,7 +80,7 @@ Index: ffplay.c
          /* XXX: use variable in the frame */
          if (is->video_st->sample_aspect_ratio.num)
              aspect_ratio = av_q2d(is->video_st->sample_aspect_ratio);
-@@ -652,9 +681,10 @@
+@@ -654,9 +683,10 @@
              aspect_ratio = av_q2d(is->video_st->codec->sample_aspect_ratio);
          else
              aspect_ratio = 0;
@@ -92,7 +92,7 @@ Index: ffplay.c
          /* if an active format is indicated, then it overrides the
             mpeg format */
  #if 0
-@@ -857,9 +887,15 @@
+@@ -859,9 +889,15 @@
      } else if(!is_full_screen && screen_width){
          w = screen_width;
          h = screen_height;
@@ -108,7 +108,7 @@ Index: ffplay.c
      } else {
          w = 640;
          h = 480;
-@@ -1172,12 +1208,23 @@
+@@ -1174,12 +1210,23 @@
      if (vp->bmp)
          SDL_FreeYUVOverlay(vp->bmp);
  
@@ -136,7 +136,7 @@ Index: ffplay.c
  
      SDL_LockMutex(is->pictq_mutex);
      vp->allocated = 1;
-@@ -1193,7 +1240,9 @@
+@@ -1195,7 +1242,9 @@
  {
      VideoPicture *vp;
      int dst_pix_fmt;
@@ -147,7 +147,7 @@ Index: ffplay.c
      /* wait until we have space to put a new picture */
      SDL_LockMutex(is->pictq_mutex);
      while (is->pictq_size >= VIDEO_PICTURE_QUEUE_SIZE &&
-@@ -1209,8 +1258,13 @@
+@@ -1211,8 +1260,13 @@
  
      /* alloc or resize hardware picture buffer */
      if (!vp->bmp ||
@@ -161,7 +161,7 @@ Index: ffplay.c
          SDL_Event event;
  
          vp->allocated = 0;
-@@ -1235,6 +1289,11 @@
+@@ -1237,6 +1291,11 @@
      /* if the frame is not skipped, then display it */
      if (vp->bmp) {
          AVPicture pict;
@@ -173,7 +173,7 @@ Index: ffplay.c
  
          /* get a pointer on the bitmap */
          SDL_LockYUVOverlay (vp->bmp);
-@@ -1248,18 +1307,30 @@
+@@ -1250,18 +1309,30 @@
          pict.linesize[0] = vp->bmp->pitches[0];
          pict.linesize[1] = vp->bmp->pitches[2];
          pict.linesize[2] = vp->bmp->pitches[1];
@@ -208,7 +208,7 @@ Index: ffplay.c
          /* update the bitmap content */
          SDL_UnlockYUVOverlay(vp->bmp);
  
-@@ -1314,54 +1385,273 @@
+@@ -1316,54 +1387,273 @@
      return queue_picture(is, src_frame, pts);
  }
  
@@ -513,7 +513,7 @@ Index: ffplay.c
      av_free(frame);
      return 0;
  }
-@@ -2137,6 +2427,12 @@
+@@ -2139,6 +2429,12 @@
      /* free all pictures */
      for(i=0;i<VIDEO_PICTURE_QUEUE_SIZE; i++) {
          vp = &is->pictq[i];
@@ -526,7 +526,7 @@ Index: ffplay.c
          if (vp->bmp) {
              SDL_FreeYUVOverlay(vp->bmp);
              vp->bmp = NULL;
-@@ -2146,8 +2442,10 @@
+@@ -2148,8 +2444,10 @@
      SDL_DestroyCond(is->pictq_cond);
      SDL_DestroyMutex(is->subpq_mutex);
      SDL_DestroyCond(is->subpq_cond);
@@ -537,7 +537,7 @@ Index: ffplay.c
      av_free(is);
  }
  
-@@ -2239,6 +2537,9 @@
+@@ -2241,6 +2539,9 @@
          av_free(avcodec_opts[i]);
      av_free(avformat_opts);
      av_free(sws_opts);
@@ -547,7 +547,7 @@ Index: ffplay.c
      if (show_status)
          printf("\n");
      SDL_Quit();
-@@ -2484,6 +2785,9 @@
+@@ -2486,6 +2787,9 @@
      { "ec", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&error_concealment}, "set error concealment options",  "bit_mask" },
      { "sync", HAS_ARG | OPT_FUNC2 | OPT_EXPERT, {(void*)opt_sync}, "set audio-video sync. type (type=audio/video/ext)", "type" },
      { "threads", HAS_ARG | OPT_FUNC2 | OPT_EXPERT, {(void*)opt_thread_count}, "thread count", "count" },
@@ -557,7 +557,7 @@ Index: ffplay.c
      { "default", OPT_FUNC2 | HAS_ARG | OPT_AUDIO | OPT_VIDEO | OPT_EXPERT, {(void*)opt_default}, "generic catch all option", "" },
      { NULL, },
  };
-@@ -2532,7 +2836,9 @@
+@@ -2534,7 +2838,9 @@
          avcodec_opts[i]= avcodec_alloc_context2(i);
      }
      avformat_opts = avformat_alloc_context();

Modified: libavfilter/diffs/02_ffmpeg_filters.diff
==============================================================================
--- libavfilter/diffs/02_ffmpeg_filters.diff	Wed Dec 16 00:15:11 2009	(r5541)
+++ libavfilter/diffs/02_ffmpeg_filters.diff	Wed Dec 16 13:24:29 2009	(r5542)
@@ -1,6 +1,6 @@
 Index: ffmpeg.c
 ===================================================================
---- ffmpeg.c	(revision 20790)
+--- ffmpeg.c	(revision 20880)
 +++ ffmpeg.c	(working copy)
 @@ -41,6 +41,13 @@
  #include "libavutil/avstring.h"
@@ -16,7 +16,7 @@ Index: ffmpeg.c
  #if HAVE_SYS_RESOURCE_H
  #include <sys/types.h>
  #include <sys/resource.h>
-@@ -142,6 +149,10 @@
+@@ -143,6 +150,10 @@
  static int loop_input = 0;
  static int loop_output = AVFMT_NOOUTPUTLOOP;
  static int qp_hist = 0;
@@ -27,7 +27,7 @@ Index: ffmpeg.c
  
  static int intra_only = 0;
  static int audio_sample_rate = 44100;
-@@ -298,6 +309,13 @@
+@@ -299,6 +310,13 @@
                                  is not defined */
      int64_t       pts;       /* current pts */
      int is_start;            /* is 1 at the start and after a discontinuity */
@@ -41,7 +41,7 @@ Index: ffmpeg.c
  } AVInputStream;
  
  typedef struct AVInputFile {
-@@ -313,6 +331,186 @@
+@@ -314,6 +332,186 @@
  static struct termios oldtty;
  #endif
  
@@ -228,7 +228,7 @@ Index: ffmpeg.c
  static void term_exit(void)
  {
  #if HAVE_TERMIOS_H
-@@ -453,6 +651,10 @@
+@@ -454,6 +652,10 @@
      allocated_audio_buf_size= allocated_audio_out_size= 0;
      av_free(samples);
  
@@ -239,7 +239,7 @@ Index: ffmpeg.c
      if (received_sigterm) {
          fprintf(stderr,
              "Received signal %d: terminating.\n",
-@@ -882,7 +1084,9 @@
+@@ -883,7 +1085,9 @@
                           int *frame_size)
  {
      int nb_frames, i, ret;
@@ -249,7 +249,7 @@ Index: ffmpeg.c
      AVFrame *final_picture, *formatted_picture, *resampling_dst, *padding_src;
      AVFrame picture_crop_temp, picture_pad_temp;
      AVCodecContext *enc, *dec;
-@@ -928,6 +1132,9 @@
+@@ -929,6 +1133,9 @@
      if (nb_frames <= 0)
          return;
  
@@ -259,7 +259,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) {
              fprintf(stderr, "error cropping picture\n");
-@@ -939,6 +1146,7 @@
+@@ -940,6 +1147,7 @@
      } else {
          formatted_picture = in_picture;
      }
@@ -267,7 +267,7 @@ Index: ffmpeg.c
  
      final_picture = formatted_picture;
      padding_src = formatted_picture;
-@@ -965,6 +1173,7 @@
+@@ -966,6 +1174,7 @@
              av_exit(1);
      }
  
@@ -275,7 +275,7 @@ Index: ffmpeg.c
      if (ost->video_resample) {
          padding_src = NULL;
          final_picture = &ost->pict_tmp;
-@@ -1012,6 +1221,7 @@
+@@ -1013,6 +1222,7 @@
          sws_scale(ost->img_resample_ctx, formatted_picture->data, formatted_picture->linesize,
                0, ost->resample_height, resampling_dst->data, resampling_dst->linesize);
      }
@@ -283,7 +283,7 @@ Index: ffmpeg.c
  
      if (ost->video_pad) {
          av_picture_pad((AVPicture*)final_picture, (AVPicture *)padding_src,
-@@ -1278,6 +1488,10 @@
+@@ -1279,6 +1489,10 @@
      static unsigned int samples_size= 0;
      AVSubtitle subtitle, *subtitle_to_free;
      int got_subtitle;
@@ -294,7 +294,7 @@ Index: ffmpeg.c
      AVPacket avpkt;
      int bps = av_get_bits_per_sample_format(ist->st->codec->sample_fmt)>>3;
  
-@@ -1400,6 +1614,15 @@
+@@ -1401,6 +1615,15 @@
                                      &buffer_to_free);
          }
  
@@ -310,7 +310,7 @@ Index: ffmpeg.c
          // preprocess audio (volume)
          if (ist->st->codec->codec_type == CODEC_TYPE_AUDIO) {
              if (audio_volume != 256) {
-@@ -1421,10 +1644,18 @@
+@@ -1422,10 +1645,18 @@
              if (pts > now)
                  usleep(pts - now);
          }
@@ -330,7 +330,7 @@ Index: ffmpeg.c
              for(i=0;i<nb_ostreams;i++) {
                  int frame_size;
  
-@@ -1441,6 +1672,9 @@
+@@ -1442,6 +1673,9 @@
                              do_audio_out(os, ost, ist, data_buf, data_size);
                              break;
                          case CODEC_TYPE_VIDEO:
@@ -340,7 +340,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);
-@@ -1506,7 +1740,17 @@
+@@ -1507,7 +1741,17 @@
                          av_free_packet(&opkt);
                      }
                  }
@@ -358,7 +358,7 @@ Index: ffmpeg.c
          av_free(buffer_to_free);
          /* XXX: allocate the subtitles in the codec ? */
          if (subtitle_to_free) {
-@@ -1960,9 +2204,10 @@
+@@ -1961,9 +2205,10 @@
                          av_exit(1);
                      }
  
@@ -370,7 +370,7 @@ Index: ffmpeg.c
                      codec->bits_per_raw_sample= 0;
                  }
                  ost->resample_height = icodec->height - (frame_topBand  + frame_bottomBand);
-@@ -1970,6 +2215,13 @@
+@@ -1971,6 +2216,13 @@
                  ost->resample_pix_fmt= icodec->pix_fmt;
                  ost->encoding_needed = 1;
                  ist->decoding_needed = 1;
@@ -384,7 +384,7 @@ Index: ffmpeg.c
                  break;
              case CODEC_TYPE_SUBTITLE:
                  ost->encoding_needed = 1;
-@@ -2356,6 +2608,12 @@
+@@ -2357,6 +2609,12 @@
              avcodec_close(ist->st->codec);
          }
      }
@@ -397,7 +397,7 @@ Index: ffmpeg.c
  
      /* finished ! */
      ret = 0;
-@@ -3918,6 +4176,9 @@
+@@ -3912,6 +4170,9 @@
      { "psnr", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&do_psnr}, "calculate PSNR of compressed frames" },
      { "vstats", OPT_EXPERT | OPT_VIDEO, {(void*)&opt_vstats}, "dump video coding statistics to file" },
      { "vstats_file", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)opt_vstats_file}, "dump video coding statistics to file", "file" },

Modified: libavfilter/diffs/03_libavfilter_doc.diff
==============================================================================
--- libavfilter/diffs/03_libavfilter_doc.diff	Wed Dec 16 00:15:11 2009	(r5541)
+++ libavfilter/diffs/03_libavfilter_doc.diff	Wed Dec 16 13:24:29 2009	(r5542)
@@ -1,6 +1,6 @@
 Index: doc/libavfilter.texi
 ===================================================================
---- doc/libavfilter.texi	(revision 20790)
+--- doc/libavfilter.texi	(revision 20880)
 +++ doc/libavfilter.texi	(working copy)
 @@ -111,6 +111,20 @@
  


More information about the FFmpeg-soc mailing list