Author: stefano
Date: Thu Nov 12 01:20:18 2009
New Revision: 5442
Log:
Update to FFmpeg r20520, in particular remove the scale filter which
is now integrated in FFmpeg.
Deleted:
libavfilter/vf_scale.c
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 Nov 11 17:48:19 2009 (r5441)
+++ libavfilter/checkout.sh Thu Nov 12 01:20:18 2009 (r5442)
@@ -1,11 +1,11 @@
#! /bin/sh
echo "checking out pristine ffmpeg"
-svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r20447
+svn checkout svn://svn.ffmpeg.org/ffmpeg/trunk/ ffmpeg -r20520
echo "downloading the corresponding version of swscale"
cd ffmpeg/libswscale
-svn up -r29818
+svn up -r29885
cd ../..
echo "patching ffmpeg"
Modified: libavfilter/diffs/01_ffplay_filters.diff
==============================================================================
--- libavfilter/diffs/01_ffplay_filters.diff Wed Nov 11 17:48:19 2009
(r5441)
+++ libavfilter/diffs/01_ffplay_filters.diff Thu Nov 12 01:20:18 2009
(r5442)
@@ -1,8 +1,8 @@
Index: ffplay.c
===================================================================
---- ffplay.c (revision 20447)
+--- ffplay.c (revision 20520)
+++ ffplay.c (working copy)
-@@ -29,6 +29,12 @@
+@@ -30,6 +30,12 @@
#include "libavcodec/colorspace.h"
#include "libavcodec/opt.h"
@@ -15,7 +15,7 @@ Index: ffplay.c
#include "cmdutils.h"
#include <SDL.h>
-@@ -67,7 +73,9 @@
+@@ -68,7 +74,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;
-@@ -85,7 +93,12 @@
+@@ -86,7 +94,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 {
-@@ -168,11 +181,17 @@
+@@ -169,11 +182,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);
-@@ -213,6 +232,9 @@
+@@ -214,6 +233,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;
-@@ -644,6 +666,13 @@
+@@ -645,6 +667,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);
-@@ -651,9 +680,10 @@
+@@ -652,9 +681,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
-@@ -856,9 +886,15 @@
+@@ -857,9 +887,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;
-@@ -1171,12 +1207,23 @@
+@@ -1172,12 +1208,23 @@
if (vp->bmp)
SDL_FreeYUVOverlay(vp->bmp);
@@ -136,7 +136,7 @@ Index: ffplay.c
SDL_LockMutex(is->pictq_mutex);
vp->allocated = 1;
-@@ -1192,7 +1239,9 @@
+@@ -1193,7 +1240,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 &&
-@@ -1208,8 +1257,13 @@
+@@ -1209,8 +1258,13 @@
/* alloc or resize hardware picture buffer */
if (!vp->bmp ||
@@ -161,7 +161,7 @@ Index: ffplay.c
SDL_Event event;
vp->allocated = 0;
-@@ -1234,6 +1288,11 @@
+@@ -1235,6 +1289,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);
-@@ -1247,18 +1306,30 @@
+@@ -1248,18 +1307,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);
-@@ -1313,54 +1384,273 @@
+@@ -1314,54 +1385,273 @@
return queue_picture(is, src_frame, pts);
}
@@ -513,7 +513,7 @@ Index: ffplay.c
av_free(frame);
return 0;
}
-@@ -2136,6 +2426,12 @@
+@@ -2137,6 +2427,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;
-@@ -2145,8 +2441,10 @@
+@@ -2146,8 +2442,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);
}
-@@ -2238,6 +2536,9 @@
+@@ -2239,6 +2537,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();
-@@ -2486,6 +2787,9 @@
+@@ -2487,6 +2788,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", "" },
{ "loglevel", HAS_ARG | OPT_FUNC2, {(void*)opt_loglevel}, "set libav*
logging level", "loglevel" },
{ NULL, },
-@@ -2535,7 +2839,9 @@
+@@ -2536,7 +2840,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 Nov 11 17:48:19 2009
(r5441)
+++ libavfilter/diffs/02_ffmpeg_filters.diff Thu Nov 12 01:20:18 2009
(r5442)
@@ -1,6 +1,6 @@
Index: ffmpeg.c
===================================================================
---- ffmpeg.c (revision 20447)
+--- ffmpeg.c (revision 20520)
+++ ffmpeg.c (working copy)
@@ -41,6 +41,13 @@
#include "libavutil/avstring.h"
Modified: libavfilter/diffs/03_libavfilter_doc.diff
==============================================================================
--- libavfilter/diffs/03_libavfilter_doc.diff Wed Nov 11 17:48:19 2009
(r5441)
+++ libavfilter/diffs/03_libavfilter_doc.diff Thu Nov 12 01:20:18 2009
(r5442)
@@ -1,6 +1,6 @@
Index: doc/libavfilter.texi
===================================================================
---- doc/libavfilter.texi (revision 20447)
+--- doc/libavfilter.texi (revision 20520)
+++ doc/libavfilter.texi (working copy)
@@ -111,6 +111,20 @@
@@ -54,7 +54,7 @@ Index: doc/libavfilter.texi
@section noformat
Force libavfilter not to use any of the specified pixel formats for the
-@@ -149,6 +187,65 @@
+@@ -149,6 +187,37 @@
Pass the source unchanged to the output.
@@ -89,16 +89,13 @@ Index: doc/libavfilter.texi
+
+Rotate video by a chosen amount in degrees. By default, 45 degrees.
+
-...@section scale
-+
-...@example
-+./ffmpeg -i in.avi -vfilters "scale=200:100:sws_flags=bicubic" out.avi
-...@end example
-+
-+Scale to new width/height and/or convert pixel format.
-+The two first parameter are the desired width and height.
-+If the third parameter @var{sws_flags} is absent, then @var{bilinear} is
assumed.
-+
+ @section scale
+
+ Scale the input video to width:height and/or convert the image format.
+@@ -174,6 +243,24 @@
+
+ The default value of ``width'' and ``height'' is 0.
+
+...@section setpts
+
+...@example
@@ -120,7 +117,7 @@ Index: doc/libavfilter.texi
@section slicify
Pass the images of input video on to next video filter as multiple
-@@ -164,6 +261,19 @@
+@@ -189,6 +276,19 @@
Adding this in the beginning of filter chains should make filtering
faster due to better use of the memory cache.
@@ -140,7 +137,7 @@ Index: doc/libavfilter.texi
@section vflip
Flip the input video vertically.
-@@ -172,4 +282,30 @@
+@@ -197,4 +297,30 @@
./ffmpeg -i in.avi -vfilters "vflip" out.avi
@end example
_______________________________________________
FFmpeg-soc mailing list
FFmpeg-soc@mplayerhq.hu
https://lists.mplayerhq.hu/mailman/listinfo/ffmpeg-soc
