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

[stefano]

Author: stefano
Date: Fri Jan  1 16:32:44 2010
New Revision: 5550

Log:
Update to FFmpeg r20995 / libswscale r30160.

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	Tue Dec 22 01:37:08 2009	(r5549)
+++ libavfilter/checkout.sh	Fri Jan  1 16:32:44 2010	(r5550)
@@ -1,11 +1,11 @@
 #! /bin/sh
 
 echo "checking out pristine ffmpeg"
-svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r20880
+svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r20995
 
 echo "downloading the corresponding version of swscale"
 cd ffmpeg/libswscale
-svn up -r29978
+svn up -r30160
 cd ../..
 
 echo "patching ffmpeg"

Modified: libavfilter/diffs/01_ffplay_filters.diff
==============================================================================
--- libavfilter/diffs/01_ffplay_filters.diff	Tue Dec 22 01:37:08 2009	(r5549)
+++ libavfilter/diffs/01_ffplay_filters.diff	Fri Jan  1 16:32:44 2010	(r5550)
@@ -1,6 +1,6 @@
 Index: ffplay.c
 ===================================================================
---- ffplay.c	(revision 20880)
+--- ffplay.c	(revision 20995)
 +++ ffplay.c	(working copy)
 @@ -30,6 +30,12 @@
  #include "libavcodec/colorspace.h"
@@ -511,7 +511,7 @@ Index: ffplay.c
      av_free(frame);
      return 0;
  }
-@@ -2139,6 +2427,12 @@
+@@ -2138,6 +2426,12 @@
      /* free all pictures */
      for(i=0;i<VIDEO_PICTURE_QUEUE_SIZE; i++) {
          vp = &is->pictq[i];
@@ -524,7 +524,7 @@ Index: ffplay.c
          if (vp->bmp) {
              SDL_FreeYUVOverlay(vp->bmp);
              vp->bmp = NULL;
-@@ -2148,8 +2442,10 @@
+@@ -2147,8 +2441,10 @@
      SDL_DestroyCond(is->pictq_cond);
      SDL_DestroyMutex(is->subpq_mutex);
      SDL_DestroyCond(is->subpq_cond);
@@ -535,7 +535,7 @@ Index: ffplay.c
      av_free(is);
  }
  
-@@ -2241,6 +2537,9 @@
+@@ -2240,6 +2536,9 @@
          av_free(avcodec_opts[i]);
      av_free(avformat_opts);
      av_free(sws_opts);
@@ -545,7 +545,7 @@ Index: ffplay.c
      if (show_status)
          printf("\n");
      SDL_Quit();
-@@ -2486,6 +2785,9 @@
+@@ -2485,6 +2784,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" },
@@ -555,7 +555,7 @@ Index: ffplay.c
      { "default", OPT_FUNC2 | HAS_ARG | OPT_AUDIO | OPT_VIDEO | OPT_EXPERT, {(void*)opt_default}, "generic catch all option", "" },
      { NULL, },
  };
-@@ -2528,13 +2830,18 @@
+@@ -2532,13 +2834,18 @@
      /* register all codecs, demux and protocols */
      avcodec_register_all();
      avdevice_register_all();

Modified: libavfilter/diffs/02_ffmpeg_filters.diff
==============================================================================
--- libavfilter/diffs/02_ffmpeg_filters.diff	Tue Dec 22 01:37:08 2009	(r5549)
+++ libavfilter/diffs/02_ffmpeg_filters.diff	Fri Jan  1 16:32:44 2010	(r5550)
@@ -1,6 +1,6 @@
 Index: ffmpeg.c
 ===================================================================
---- ffmpeg.c	(revision 20880)
+--- ffmpeg.c	(revision 20995)
 +++ ffmpeg.c	(working copy)
 @@ -41,6 +41,13 @@
  #include "libavutil/avstring.h"
@@ -395,7 +395,7 @@ Index: ffmpeg.c
  
      /* finished ! */
      ret = 0;
-@@ -3912,6 +4168,9 @@
+@@ -3914,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" },
@@ -405,7 +405,7 @@ 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", "" },
-@@ -3972,6 +4231,9 @@
+@@ -3974,6 +4233,9 @@
  
      avcodec_register_all();
      avdevice_register_all();

Modified: libavfilter/diffs/03_libavfilter_doc.diff
==============================================================================
--- libavfilter/diffs/03_libavfilter_doc.diff	Tue Dec 22 01:37:08 2009	(r5549)
+++ libavfilter/diffs/03_libavfilter_doc.diff	Fri Jan  1 16:32:44 2010	(r5550)
@@ -1,6 +1,6 @@
 Index: doc/libavfilter.texi
 ===================================================================
---- doc/libavfilter.texi	(revision 20880)
+--- doc/libavfilter.texi	(revision 20995)
 +++ doc/libavfilter.texi	(working copy)
 @@ -111,6 +111,20 @@