[FFmpeg-soc] [soc]: r798 - libavfilter/ffmpeg.diff
koorogi
subversion at mplayerhq.hu
Wed Aug 15 01:41:59 CEST 2007
Author: koorogi
Date: Wed Aug 15 01:41:59 2007
New Revision: 798
Log:
Update ffmpeg diff to current SVN
Modified:
libavfilter/ffmpeg.diff
Modified: libavfilter/ffmpeg.diff
==============================================================================
--- libavfilter/ffmpeg.diff (original)
+++ libavfilter/ffmpeg.diff Wed Aug 15 01:41:59 2007
@@ -1,6 +1,6 @@
Index: configure
===================================================================
---- configure (revision 10017)
+--- configure (revision 10118)
+++ configure (working copy)
@@ -70,6 +70,7 @@
echo " and ffmpeg will be under GPL [default=no]"
@@ -18,7 +18,7 @@ Index: configure
avisynth
beos_netserver
bktr
-@@ -1832,6 +1834,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}"
-@@ -2110,3 +2113,8 @@
+@@ -2115,3 +2118,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: ffplay.c
===================================================================
---- ffplay.c (revision 10017)
+--- ffplay.c (revision 10118)
+++ ffplay.c (working copy)
@@ -25,6 +25,10 @@
#include "swscale.h"
@@ -84,7 +84,7 @@ Index: ffplay.c
/* current context */
static int is_full_screen;
-@@ -852,9 +868,15 @@
+@@ -858,9 +874,15 @@
} else if(!is_full_screen && screen_width){
w = screen_width;
h = screen_height;
@@ -100,7 +100,7 @@ Index: ffplay.c
} else {
w = 640;
h = 480;
-@@ -1160,6 +1182,20 @@
+@@ -1166,6 +1188,20 @@
if (vp->bmp)
SDL_FreeYUVOverlay(vp->bmp);
@@ -121,7 +121,7 @@ Index: ffplay.c
#if 0
/* XXX: use generic function */
/* XXX: disable overlay if no hardware acceleration or if RGB format */
-@@ -1177,12 +1213,9 @@
+@@ -1183,12 +1219,9 @@
break;
}
#endif
@@ -135,7 +135,7 @@ Index: ffplay.c
SDL_LockMutex(is->pictq_mutex);
vp->allocated = 1;
-@@ -1216,8 +1249,13 @@
+@@ -1222,8 +1255,13 @@
/* alloc or resize hardware picture buffer */
if (!vp->bmp ||
@@ -149,7 +149,7 @@ Index: ffplay.c
SDL_Event event;
vp->allocated = 0;
-@@ -1241,6 +1279,12 @@
+@@ -1247,6 +1285,12 @@
/* if the frame is not skipped, then display it */
if (vp->bmp) {
@@ -162,7 +162,7 @@ Index: ffplay.c
/* get a pointer on the bitmap */
SDL_LockYUVOverlay (vp->bmp);
-@@ -1253,16 +1297,16 @@
+@@ -1259,16 +1303,16 @@
pict.linesize[1] = vp->bmp->pitches[2];
pict.linesize[2] = vp->bmp->pitches[1];
img_convert_ctx = sws_getCachedContext(img_convert_ctx,
@@ -183,7 +183,7 @@ Index: ffplay.c
/* update the bitmap content */
SDL_UnlockYUVOverlay(vp->bmp);
-@@ -1332,21 +1376,12 @@
+@@ -1338,21 +1382,12 @@
avcodec_default_release_buffer(c, pic);
}
@@ -208,7 +208,7 @@ Index: ffplay.c
if(pkt->data == flush_pkt.data){
avcodec_flush_buffers(is->video_st->codec);
continue;
-@@ -1355,31 +1390,216 @@
+@@ -1361,31 +1396,216 @@
/* NOTE: ipts is the PTS of the _first_ picture beginning in
this packet, if any */
global_video_pkt_pts= pkt->pts;
@@ -437,7 +437,7 @@ Index: ffplay.c
av_free(frame);
return 0;
}
-@@ -2130,6 +2350,12 @@
+@@ -2136,6 +2356,12 @@
/* free all pictures */
for(i=0;i<VIDEO_PICTURE_QUEUE_SIZE; i++) {
vp = &is->pictq[i];
@@ -450,7 +450,7 @@ Index: ffplay.c
if (vp->bmp) {
SDL_FreeYUVOverlay(vp->bmp);
vp->bmp = NULL;
-@@ -2482,6 +2708,9 @@
+@@ -2488,6 +2714,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" },
@@ -462,7 +462,7 @@ Index: ffplay.c
Index: Makefile
===================================================================
---- Makefile (revision 10017)
+--- Makefile (revision 10118)
+++ Makefile (working copy)
@@ -8,6 +8,7 @@
More information about the FFmpeg-soc
mailing list