[FFmpeg-soc] [soc]: r1405 - in libavfilter/diffs: 00_build.diff 01_ffplay_get_video_frame.diff 02_ffplay_VideoPicture_vars.diff 03_ffplay_filters.diff
vitor
subversion at mplayerhq.hu
Tue Oct 16 08:45:10 CEST 2007
Author: vitor
Date: Tue Oct 16 08:45:10 2007
New Revision: 1405
Log:
Update patches to apply cleanly to latest svn
Modified:
libavfilter/diffs/00_build.diff
libavfilter/diffs/01_ffplay_get_video_frame.diff
libavfilter/diffs/02_ffplay_VideoPicture_vars.diff
libavfilter/diffs/03_ffplay_filters.diff
Modified: libavfilter/diffs/00_build.diff
==============================================================================
--- libavfilter/diffs/00_build.diff (original)
+++ libavfilter/diffs/00_build.diff Tue Oct 16 08:45:10 2007
@@ -1,6 +1,6 @@
Index: configure
===================================================================
---- configure (revision 10118)
+--- configure (revision 10755)
+++ configure (working copy)
@@ -70,6 +70,7 @@
echo " and ffmpeg will be under GPL [default=no]"
@@ -10,15 +10,15 @@ Index: configure
echo " --enable-beosthreads use BeOS threads [default=no]"
echo " --enable-pthreads use pthreads [default=no]"
echo " --enable-w32threads use Win32 threads [default=no]"
-@@ -570,6 +571,7 @@
- CONFIG_LIST='
- audio_beos
- audio_oss
+@@ -599,6 +600,7 @@
+
+ CONFIG_LIST="
+ $COMPONENT_LIST
+ avfilter
avisynth
beos_netserver
- bktr
-@@ -1837,6 +1839,7 @@
+ ffmpeg
+@@ -1790,6 +1792,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}"
-@@ -2115,3 +2118,8 @@
+@@ -2059,3 +2062,8 @@
apply libswscale.pc sed s/^Libs:.*$/Libs:/
apply libswscale-uninstalled.pc sed s/^Libs:.*$/Libs:/
fi
@@ -37,7 +37,7 @@ Index: configure
+fi
Index: Makefile
===================================================================
---- Makefile (revision 10118)
+--- Makefile (revision 10755)
+++ Makefile (working copy)
@@ -8,6 +8,7 @@
@@ -70,7 +70,7 @@ Index: Makefile
ffmpeg_g$(EXESUF): ffmpeg.o cmdutils.o .libs
$(CC) $(LDFLAGS) -o $@ ffmpeg.o cmdutils.o $(EXTRALIBS)
-@@ -181,6 +190,9 @@
+@@ -182,6 +191,9 @@
$(MAKE) -C libpostproc install-headers
endif
$(MAKE) -C libswscale install-headers
@@ -80,22 +80,23 @@ Index: Makefile
uninstall: uninstall-progs uninstall-libs uninstall-headers uninstall-man uninstall-vhook
-@@ -199,12 +211,14 @@
- $(MAKE) -C libavcodec uninstall-libs
+@@ -201,6 +213,7 @@
$(MAKE) -C libavformat uninstall-libs
$(MAKE) -C libpostproc uninstall-libs
+ $(MAKE) -C libswscale uninstall-libs
+ $(MAKE) -C libavfilter uninstall-libs
uninstall-headers:
$(MAKE) -C libavutil uninstall-headers
- $(MAKE) -C libavcodec uninstall-headers
+@@ -208,6 +221,7 @@
$(MAKE) -C libavformat uninstall-headers
$(MAKE) -C libpostproc uninstall-headers
+ $(MAKE) -C libswscale uninstall-headers
+ $(MAKE) -C libavfilter uninstall-headers
-rmdir "$(INCDIR)"
depend dep: .depend .vhookdep
-@@ -217,6 +231,9 @@
+@@ -220,6 +234,9 @@
ifeq ($(CONFIG_SWSCALER),yes)
$(MAKE) -C libswscale depend
endif
@@ -105,7 +106,7 @@ Index: Makefile
.depend: $(SRCS) version.h
$(CC) -MM $(CFLAGS) $(SDL_CFLAGS) $(filter-out %.h,$^) 1>.depend
-@@ -236,6 +253,7 @@
+@@ -239,6 +256,7 @@
$(MAKE) -C libavformat clean
$(MAKE) -C libpostproc clean
$(MAKE) -C libswscale clean
@@ -113,11 +114,11 @@ Index: Makefile
rm -f *.o *~ .libs gmon.out TAGS $(ALLPROGS) $(ALLPROGS_G) \
output_example$(EXESUF) qt-faststart$(EXESUF) cws2fws$(EXESUF)
rm -f doc/*.html doc/*.pod doc/*.1
-@@ -249,6 +267,7 @@
+@@ -252,6 +270,7 @@
$(MAKE) -C libavformat distclean
$(MAKE) -C libpostproc distclean
$(MAKE) -C libswscale distclean
+ $(MAKE) -C libavfilter distclean
- rm -f .depend version.h config.* *.pc
+ rm -f .depend .vhookdep version.h config.* *.pc
TAGS:
Modified: libavfilter/diffs/01_ffplay_get_video_frame.diff
==============================================================================
--- libavfilter/diffs/01_ffplay_get_video_frame.diff (original)
+++ libavfilter/diffs/01_ffplay_get_video_frame.diff Tue Oct 16 08:45:10 2007
@@ -1,8 +1,8 @@
Index: ffplay.c
===================================================================
---- ffplay.c (revision 10134)
+--- ffplay.c (revision 10755)
+++ ffplay.c (working copy)
-@@ -1338,21 +1338,12 @@
+@@ -1341,21 +1341,12 @@
avcodec_default_release_buffer(c, pic);
}
@@ -27,7 +27,7 @@ Index: ffplay.c
if(pkt->data == flush_pkt.data){
avcodec_flush_buffers(is->video_st->codec);
continue;
-@@ -1361,26 +1352,45 @@
+@@ -1364,26 +1355,45 @@
/* NOTE: ipts is the PTS of the _first_ picture beginning in
this packet, if any */
global_video_pkt_pts= pkt->pts;
Modified: libavfilter/diffs/02_ffplay_VideoPicture_vars.diff
==============================================================================
--- libavfilter/diffs/02_ffplay_VideoPicture_vars.diff (original)
+++ libavfilter/diffs/02_ffplay_VideoPicture_vars.diff Tue Oct 16 08:45:10 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
-@@ -79,6 +79,7 @@
+--- ffplay.c 2007-08-20 11:47:41.000000000 -0400
++++ ffplay.c 2007-08-20 11:53:06.000000000 -0400
+@@ -82,6 +82,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;
-@@ -652,10 +653,9 @@
+@@ -655,10 +656,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
-@@ -1166,6 +1166,10 @@
+@@ -1169,6 +1169,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 */
-@@ -1183,12 +1187,9 @@
+@@ -1186,12 +1190,9 @@
break;
}
#endif
@@ -46,7 +46,7 @@
SDL_LockMutex(is->pictq_mutex);
vp->allocated = 1;
-@@ -1259,16 +1260,14 @@
+@@ -1262,16 +1263,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 Tue Oct 16 08:45:10 2007
@@ -1,5 +1,5 @@
---- ffplay.c 2007-08-20 11:53:06.000000000 -0400
-+++ ffplay.c 2007-08-20 11:57:49.000000000 -0400
+--- ffplay.c 2007-08-20 11:53:06.000000000 -0400
++++ ffplay.c 2007-08-20 11:57:49.000000000 -0400
@@ -25,6 +25,10 @@
#include "swscale.h"
#include "avstring.h"
@@ -11,7 +11,7 @@
#include "version.h"
#include "cmdutils.h"
-@@ -81,6 +85,10 @@
+@@ -84,6 +88,10 @@
int width, height; /* source height & width */
enum PixelFormat pix_fmt;
int allocated;
@@ -22,7 +22,7 @@
} VideoPicture;
typedef struct SubPicture {
-@@ -163,6 +171,10 @@
+@@ -166,6 +174,10 @@
// QETimer *video_timer;
char filename[1024];
int width, height, xleft, ytop;
@@ -33,7 +33,7 @@
} VideoState;
void show_help(void);
-@@ -202,6 +214,9 @@
+@@ -205,6 +217,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;
-@@ -648,14 +663,22 @@
+@@ -651,14 +666,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
-@@ -858,9 +881,15 @@
+@@ -861,9 +884,15 @@
} else if(!is_full_screen && screen_width){
w = screen_width;
h = screen_height;
@@ -84,7 +84,7 @@
} else {
w = 640;
h = 480;
-@@ -1166,9 +1195,19 @@
+@@ -1169,9 +1198,19 @@
if (vp->bmp)
SDL_FreeYUVOverlay(vp->bmp);
@@ -104,7 +104,7 @@
#if 0
/* XXX: use generic function */
-@@ -1223,8 +1262,13 @@
+@@ -1226,8 +1265,13 @@
/* alloc or resize hardware picture buffer */
if (!vp->bmp ||
@@ -118,7 +118,7 @@
SDL_Event event;
vp->allocated = 0;
-@@ -1248,6 +1292,12 @@
+@@ -1251,6 +1295,12 @@
/* if the frame is not skipped, then display it */
if (vp->bmp) {
@@ -131,7 +131,7 @@
/* get a pointer on the bitmap */
SDL_LockYUVOverlay (vp->bmp);
-@@ -1374,6 +1424,136 @@
+@@ -1377,6 +1427,136 @@
return 0;
}
@@ -268,7 +268,7 @@
static int video_thread(void *arg)
{
VideoState *is = arg;
-@@ -1381,10 +1561,46 @@
+@@ -1384,10 +1564,46 @@
uint64_t pts_int;
double pts;
@@ -315,7 +315,7 @@
pts = pts_int;
pts /= AV_TIME_BASE;
if(output_picture2(is, frame, pts) < 0)
-@@ -1395,6 +1611,10 @@
+@@ -1398,6 +1614,10 @@
stream_pause(cur_stream);
}
the_end:
@@ -326,7 +326,7 @@
av_free(frame);
return 0;
}
-@@ -2145,6 +2365,12 @@
+@@ -2127,6 +2347,12 @@
/* free all pictures */
for(i=0;i<VIDEO_PICTURE_QUEUE_SIZE; i++) {
vp = &is->pictq[i];
@@ -339,7 +339,7 @@
if (vp->bmp) {
SDL_FreeYUVOverlay(vp->bmp);
vp->bmp = NULL;
-@@ -2497,6 +2723,9 @@
+@@ -2483,6 +2709,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" },
More information about the FFmpeg-soc
mailing list