[FFmpeg-soc] [soc]: r1614 - in libavfilter/diffs: 00_build.diff 02_ffplay_VideoPicture_vars.diff 03_ffplay_filters.diff 04_ffmpeg_filters.diff
benoit
subversion at mplayerhq.hu
Thu Dec 20 11:55:24 CET 2007
Author: benoit
Date: Thu Dec 20 11:55:24 2007
New Revision: 1614
Log:
Update diff files against ffmpeg trunk @rev 11283.
Modified:
libavfilter/diffs/00_build.diff
libavfilter/diffs/02_ffplay_VideoPicture_vars.diff
libavfilter/diffs/03_ffplay_filters.diff
libavfilter/diffs/04_ffmpeg_filters.diff
Modified: libavfilter/diffs/00_build.diff
==============================================================================
--- libavfilter/diffs/00_build.diff (original)
+++ libavfilter/diffs/00_build.diff Thu Dec 20 11:55:24 2007
@@ -1,6 +1,6 @@
Index: configure
===================================================================
---- configure (revision 11113)
+--- configure (revision 11283)
+++ configure (working copy)
@@ -70,6 +70,7 @@
echo " and ffmpeg will be under GPL [default=no]"
@@ -8,9 +8,9 @@ Index: configure
echo " --enable-swscaler software scaler support [default=no]"
+ echo " --enable-avfilter video filter support (replaces vhook) [default=no]"
echo " --enable-beosthreads use BeOS threads [default=no]"
+ echo " --enable-os2threads use OS/2 threads [default=no]"
echo " --enable-pthreads use pthreads [default=no]"
- echo " --enable-w32threads use Win32 threads [default=no]"
-@@ -598,6 +599,7 @@
+@@ -604,6 +605,7 @@
CONFIG_LIST="
$COMPONENT_LIST
@@ -18,7 +18,7 @@ Index: configure
avisynth
beos_netserver
ffmpeg
-@@ -1799,6 +1801,7 @@
+@@ -1837,6 +1839,7 @@
echo "shared ${shared-no}"
echo "postprocessing support ${pp-no}"
echo "software scaler enabled ${swscaler-no}"
@@ -26,7 +26,7 @@ Index: configure
echo "video hooking ${vhook-no}"
if enabled vhook; then
echo "Imlib2 support ${imlib2-no}"
-@@ -1992,6 +1995,7 @@
+@@ -2031,6 +2034,7 @@
libavcodec/sh4 \
libavcodec/sparc \
libavdevice \
@@ -34,7 +34,7 @@ Index: configure
libavformat \
libavutil \
libpostproc \
-@@ -2006,6 +2010,7 @@
+@@ -2045,6 +2049,7 @@
doc/texi2pod.pl \
libavcodec/Makefile \
libavdevice/Makefile \
@@ -42,7 +42,7 @@ Index: configure
libavformat/Makefile \
libavutil/Makefile \
libpostproc/Makefile \
-@@ -2094,3 +2099,8 @@
+@@ -2133,3 +2138,8 @@
apply libswscale.pc sed s/^Libs:.*$/Libs:/
apply libswscale-uninstalled.pc sed s/^Libs:.*$/Libs:/
fi
@@ -53,7 +53,7 @@ Index: configure
+fi
Index: Makefile
===================================================================
---- Makefile (revision 11113)
+--- Makefile (revision 11283)
+++ Makefile (working copy)
@@ -8,7 +8,7 @@
Modified: libavfilter/diffs/02_ffplay_VideoPicture_vars.diff
==============================================================================
--- libavfilter/diffs/02_ffplay_VideoPicture_vars.diff (original)
+++ libavfilter/diffs/02_ffplay_VideoPicture_vars.diff Thu Dec 20 11:55:24 2007
@@ -1,6 +1,6 @@
--- ffplay.c 2007-08-20 11:47:41.000000000 -0400
+++ ffplay.c 2007-08-20 11:53:06.000000000 -0400
-@@ -82,6 +82,7 @@
+@@ -84,6 +84,7 @@
double pts; ///<presentation time stamp for this picture
SDL_Overlay *bmp;
int width, height; /* source height & width */
@@ -8,7 +8,7 @@
int allocated;
} VideoPicture;
-@@ -655,10 +656,9 @@
+@@ -657,10 +658,9 @@
aspect_ratio = 0;
else
aspect_ratio = av_q2d(is->video_st->codec->sample_aspect_ratio)
@@ -21,7 +21,7 @@
/* if an active format is indicated, then it overrides the
mpeg format */
#if 0
-@@ -1169,6 +1169,10 @@
+@@ -1171,6 +1171,10 @@
if (vp->bmp)
SDL_FreeYUVOverlay(vp->bmp);
@@ -32,7 +32,7 @@
#if 0
/* XXX: use generic function */
/* XXX: disable overlay if no hardware acceleration or if RGB format */
-@@ -1186,12 +1190,9 @@
+@@ -1188,12 +1192,9 @@
break;
}
#endif
@@ -46,7 +46,7 @@
SDL_LockMutex(is->pictq_mutex);
vp->allocated = 1;
-@@ -1262,16 +1263,14 @@
+@@ -1264,16 +1265,14 @@
pict.linesize[1] = vp->bmp->pitches[2];
pict.linesize[2] = vp->bmp->pitches[1];
img_convert_ctx = sws_getCachedContext(img_convert_ctx,
Modified: libavfilter/diffs/03_ffplay_filters.diff
==============================================================================
--- libavfilter/diffs/03_ffplay_filters.diff (original)
+++ libavfilter/diffs/03_ffplay_filters.diff Thu Dec 20 11:55:24 2007
@@ -1,6 +1,6 @@
--- ffplay.c.old2 2007-10-16 20:27:42.000000000 +0200
+++ ffplay.c 2007-10-16 20:27:51.000000000 +0200
-@@ -26,6 +26,10 @@
+@@ -27,6 +27,10 @@
#include "swscale.h"
#include "avstring.h"
@@ -11,7 +11,7 @@
#include "version.h"
#include "cmdutils.h"
-@@ -85,6 +89,10 @@
+@@ -86,6 +90,10 @@
int width, height; /* source height & width */
enum PixelFormat pix_fmt;
int allocated;
@@ -22,7 +22,7 @@
} VideoPicture;
typedef struct SubPicture {
-@@ -167,6 +175,10 @@
+@@ -168,6 +176,10 @@
// QETimer *video_timer;
char filename[1024];
int width, height, xleft, ytop;
@@ -33,7 +33,7 @@
} VideoState;
void show_help(void);
-@@ -206,6 +218,9 @@
+@@ -207,6 +219,9 @@
static int error_resilience = FF_ER_CAREFUL;
static int error_concealment = 3;
static int decoder_reorder_pts= 0;
@@ -43,7 +43,7 @@
/* current context */
static int is_full_screen;
-@@ -652,14 +667,22 @@
+@@ -653,14 +668,22 @@
vp = &is->pictq[is->pictq_rindex];
if (vp->bmp) {
@@ -68,7 +68,7 @@
/* if an active format is indicated, then it overrides the
mpeg format */
#if 0
-@@ -862,9 +885,15 @@
+@@ -863,9 +886,15 @@
} else if(!is_full_screen && screen_width){
w = screen_width;
h = screen_height;
@@ -84,7 +84,7 @@
} else {
w = 640;
h = 480;
-@@ -1170,9 +1199,19 @@
+@@ -1171,9 +1200,19 @@
if (vp->bmp)
SDL_FreeYUVOverlay(vp->bmp);
@@ -104,7 +104,7 @@
#if 0
/* XXX: use generic function */
-@@ -1209,7 +1248,7 @@
+@@ -1210,7 +1249,7 @@
{
VideoPicture *vp;
int dst_pix_fmt;
@@ -113,7 +113,7 @@
static struct SwsContext *img_convert_ctx;
/* wait until we have space to put a new picture */
-@@ -1227,8 +1266,13 @@
+@@ -1228,8 +1267,13 @@
/* alloc or resize hardware picture buffer */
if (!vp->bmp ||
@@ -127,7 +127,7 @@
SDL_Event event;
vp->allocated = 0;
-@@ -1252,6 +1296,12 @@
+@@ -1253,6 +1297,12 @@
/* if the frame is not skipped, then display it */
if (vp->bmp) {
@@ -140,7 +140,7 @@
/* get a pointer on the bitmap */
SDL_LockYUVOverlay (vp->bmp);
-@@ -1263,6 +1313,19 @@
+@@ -1264,6 +1314,19 @@
pict.linesize[0] = vp->bmp->pitches[0];
pict.linesize[1] = vp->bmp->pitches[2];
pict.linesize[2] = vp->bmp->pitches[1];
@@ -160,7 +160,7 @@
img_convert_ctx = sws_getCachedContext(img_convert_ctx,
vp->width, vp->height, vp->pix_fmt, vp->width, vp->height,
dst_pix_fmt, sws_flags, NULL, NULL, NULL);
-@@ -1272,6 +1335,7 @@
+@@ -1273,6 +1336,7 @@
}
sws_scale(img_convert_ctx, src_frame->data, src_frame->linesize,
0, vp->height, pict.data, pict.linesize);
@@ -168,7 +168,7 @@
/* update the bitmap content */
SDL_UnlockYUVOverlay(vp->bmp);
-@@ -1379,6 +1443,134 @@
+@@ -1380,6 +1444,134 @@
return 0;
}
@@ -303,7 +303,7 @@
static int video_thread(void *arg)
{
VideoState *is = arg;
-@@ -1387,10 +1579,45 @@
+@@ -1388,10 +1580,45 @@
double pts;
int ret;
@@ -349,7 +349,7 @@
if (ret < 0) goto the_end;
pts = pts_int;
-@@ -1403,6 +1630,10 @@
+@@ -1404,6 +1631,10 @@
stream_pause(cur_stream);
}
the_end:
@@ -360,7 +360,7 @@
av_free(frame);
return 0;
}
-@@ -2132,6 +2363,12 @@
+@@ -2138,6 +2369,12 @@
/* free all pictures */
for(i=0;i<VIDEO_PICTURE_QUEUE_SIZE; i++) {
vp = &is->pictq[i];
@@ -373,7 +373,7 @@
if (vp->bmp) {
SDL_FreeYUVOverlay(vp->bmp);
vp->bmp = NULL;
-@@ -2488,6 +2725,9 @@
+@@ -2494,6 +2731,9 @@
#endif
{ "sync", HAS_ARG | OPT_EXPERT, {(void*)opt_sync}, "set audio-video sync. type (type=audio/video/ext)", "type" },
{ "threads", HAS_ARG | OPT_EXPERT, {(void*)opt_thread_count}, "thread count", "count" },
Modified: libavfilter/diffs/04_ffmpeg_filters.diff
==============================================================================
--- libavfilter/diffs/04_ffmpeg_filters.diff (original)
+++ libavfilter/diffs/04_ffmpeg_filters.diff Thu Dec 20 11:55:24 2007
@@ -1,6 +1,6 @@
Index: ffmpeg.c
===================================================================
---- ffmpeg.c (revision 11113)
+--- ffmpeg.c (revision 11283)
+++ ffmpeg.c (working copy)
@@ -36,6 +36,10 @@
#include "avstring.h"
@@ -13,7 +13,7 @@ Index: ffmpeg.c
#if !defined(HAVE_GETRUSAGE) && defined(HAVE_GETPROCESSTIMES)
#include <windows.h>
#endif
-@@ -140,6 +144,7 @@
+@@ -139,6 +143,7 @@
static int loop_input = 0;
static int loop_output = AVFMT_NOOUTPUTLOOP;
static int qp_hist = 0;
@@ -21,7 +21,7 @@ Index: ffmpeg.c
static int intra_only = 0;
static int audio_sample_rate = 44100;
-@@ -276,6 +281,12 @@
+@@ -275,6 +280,12 @@
is not defined */
int64_t pts; /* current pts */
int is_start; /* is 1 at the start and after a discontinuity */
@@ -34,7 +34,7 @@ Index: ffmpeg.c
} AVInputStream;
typedef struct AVInputFile {
-@@ -291,6 +302,241 @@
+@@ -290,6 +301,241 @@
static struct termios oldtty;
#endif
@@ -276,7 +276,7 @@ Index: ffmpeg.c
static void term_exit(void)
{
#ifdef HAVE_TERMIOS_H
-@@ -621,6 +867,13 @@
+@@ -635,6 +881,13 @@
frame_hook_process(picture2, dec->pix_fmt, dec->width, dec->height,
1000000 * ist->pts / AV_TIME_BASE);
@@ -290,7 +290,7 @@ Index: ffmpeg.c
if (picture != picture2)
*picture = *picture2;
*bufp = buf;
-@@ -731,6 +984,9 @@
+@@ -745,6 +998,9 @@
if (nb_frames <= 0)
return;
@@ -300,7 +300,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");
-@@ -740,6 +996,7 @@
+@@ -754,6 +1010,7 @@
} else {
formatted_picture = in_picture;
}
@@ -308,7 +308,7 @@ Index: ffmpeg.c
final_picture = formatted_picture;
padding_src = formatted_picture;
-@@ -755,12 +1012,14 @@
+@@ -769,12 +1026,14 @@
}
}
@@ -323,7 +323,7 @@ Index: ffmpeg.c
if (ost->video_pad) {
av_picture_pad((AVPicture*)final_picture, (AVPicture *)padding_src,
-@@ -1261,6 +1520,10 @@
+@@ -1275,6 +1534,10 @@
}
}
}
@@ -334,7 +334,7 @@ Index: ffmpeg.c
av_free(buffer_to_free);
/* XXX: allocate the subtitles in the codec ? */
if (subtitle_to_free) {
-@@ -1696,10 +1959,21 @@
+@@ -1680,10 +1943,21 @@
fprintf(stderr, "Cannot get resampling context\n");
exit(1);
}
@@ -356,7 +356,7 @@ Index: ffmpeg.c
break;
case CODEC_TYPE_SUBTITLE:
ost->encoding_needed = 1;
-@@ -3784,6 +4058,9 @@
+@@ -3779,6 +4053,9 @@
#ifdef CONFIG_VHOOK
{ "vhook", HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)add_frame_hooker}, "insert video processing module", "module" },
#endif
More information about the FFmpeg-soc
mailing list