Author: vitor
Date: Tue Apr 22 17:38:59 2008
New Revision: 2144
Log:
Fix ffplay compilation
Modified:
libavfilter/diffs/03_ffplay_filters.diff
Modified: libavfilter/diffs/03_ffplay_filters.diff
==============================================================================
--- libavfilter/diffs/03_ffplay_filters.diff (original)
+++ libavfilter/diffs/03_ffplay_filters.diff Tue Apr 22 17:38:59 2008
@@ -1,18 +1,19 @@
---- ffplay.c 2008-03-27 20:31:38.000000000 +0100
-+++ ffplay.c.new 2008-03-27 20:31:22.000000000 +0100
-@@ -27,6 +27,11 @@
+--- ffplay.c.old 2008-04-22 17:33:42.000000000 +0200
++++ ffplay.c 2008-04-22 17:34:41.000000000 +0200
+@@ -27,6 +27,12 @@
#include "swscale.h"
#include "avstring.h"
+#if ENABLE_AVFILTER
+# include "avfilter.h"
+# include "avfiltergraph.h"
++# include "graphparser.h"
+#endif
+
#include "version.h"
#include "cmdutils.h"
-@@ -66,7 +71,9 @@
+@@ -66,7 +72,9 @@
/* NOTE: the size must be big enough to compensate the hardware audio
buffersize size */
#define SAMPLE_ARRAY_SIZE (2*65536)
@@ -22,7 +23,7 @@
typedef struct PacketQueue {
AVPacketList *first_pkt, *last_pkt;
-@@ -86,6 +93,10 @@
+@@ -86,6 +94,10 @@
int width, height; /* source height & width */
enum PixelFormat pix_fmt;
int allocated;
@@ -33,7 +34,7 @@
} VideoPicture;
typedef struct SubPicture {
-@@ -168,6 +179,10 @@
+@@ -168,6 +180,10 @@
// QETimer *video_timer;
char filename[1024];
int width, height, xleft, ytop;
@@ -44,7 +45,7 @@
} VideoState;
void show_help(void);
-@@ -207,6 +222,9 @@
+@@ -207,6 +223,9 @@
static int error_resilience = FF_ER_CAREFUL;
static int error_concealment = 3;
static int decoder_reorder_pts= 0;
@@ -54,7 +55,7 @@
/* current context */
static int is_full_screen;
-@@ -653,14 +671,22 @@
+@@ -653,14 +672,22 @@
vp = &is->pictq[is->pictq_rindex];
if (vp->bmp) {
@@ -79,7 +80,7 @@
/* if an active format is indicated, then it overrides the
mpeg format */
#if 0
-@@ -863,9 +889,15 @@
+@@ -863,9 +890,15 @@
} else if(!is_full_screen && screen_width){
w = screen_width;
h = screen_height;
@@ -95,7 +96,7 @@
} else {
w = 640;
h = 480;
-@@ -1171,9 +1203,19 @@
+@@ -1171,9 +1204,19 @@
if (vp->bmp)
SDL_FreeYUVOverlay(vp->bmp);
@@ -115,7 +116,7 @@
#if 0
/* XXX: use generic function */
-@@ -1211,8 +1253,11 @@
+@@ -1211,8 +1254,11 @@
VideoPicture *vp;
int dst_pix_fmt;
AVPicture pict;
@@ -128,7 +129,7 @@
/* wait until we have space to put a new picture */
SDL_LockMutex(is->pictq_mutex);
while (is->pictq_size >= VIDEO_PICTURE_QUEUE_SIZE &&
-@@ -1228,8 +1273,13 @@
+@@ -1228,8 +1274,13 @@
/* alloc or resize hardware picture buffer */
if (!vp->bmp ||
@@ -142,7 +143,7 @@
SDL_Event event;
vp->allocated = 0;
-@@ -1253,6 +1303,12 @@
+@@ -1253,6 +1304,12 @@
/* if the frame is not skipped, then display it */
if (vp->bmp) {
@@ -155,7 +156,7 @@
/* get a pointer on the bitmap */
SDL_LockYUVOverlay (vp->bmp);
-@@ -1264,6 +1320,19 @@
+@@ -1264,6 +1321,19 @@
pict.linesize[0] = vp->bmp->pitches[0];
pict.linesize[1] = vp->bmp->pitches[2];
pict.linesize[2] = vp->bmp->pitches[1];
@@ -175,7 +176,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);
-@@ -1273,6 +1342,7 @@
+@@ -1273,6 +1343,7 @@
}
sws_scale(img_convert_ctx, src_frame->data, src_frame->linesize,
0, vp->height, pict.data, pict.linesize);
@@ -183,7 +184,7 @@
/* update the bitmap content */
SDL_UnlockYUVOverlay(vp->bmp);
-@@ -1382,6 +1452,138 @@
+@@ -1382,6 +1453,138 @@
return 0;
}
@@ -322,7 +323,7 @@
static int video_thread(void *arg)
{
VideoState *is = arg;
-@@ -1390,10 +1592,42 @@
+@@ -1390,10 +1593,43 @@
double pts;
int ret;
@@ -342,7 +343,8 @@
+
+ if(vfilters) {
+ if (avfilter_parse_graph(graph, vfilters,
-+ filt_src, 0, filt_out, 0) < 0) goto the_end;
++ filt_src, 0,
++ filt_out, 0, NULL) < 0) goto the_end;
+ } else {
+ if(avfilter_link(filt_src, 0, filt_out, 0) < 0) goto the_end;
+ }
@@ -365,7 +367,7 @@
if (ret < 0) goto the_end;
-@@ -1410,6 +1644,9 @@
+@@ -1410,6 +1646,9 @@
stream_pause(cur_stream);
}
the_end:
@@ -375,7 +377,7 @@
av_free(frame);
return 0;
}
-@@ -2149,6 +2386,12 @@
+@@ -2149,6 +2388,12 @@
/* free all pictures */
for(i=0;i<VIDEO_PICTURE_QUEUE_SIZE; i++) {
vp = &is->pictq[i];
@@ -388,7 +390,7 @@
if (vp->bmp) {
SDL_FreeYUVOverlay(vp->bmp);
vp->bmp = NULL;
-@@ -2486,6 +2729,9 @@
+@@ -2486,6 +2731,9 @@
{ "ec", OPT_INT | HAS_ARG | OPT_EXPERT, {(void*)&error_concealment}, "set
error concealment options", "bit_mask" },
{ "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" },
_______________________________________________
FFmpeg-soc mailing list
FFmpeg-soc@mplayerhq.hu
https://lists.mplayerhq.hu/mailman/listinfo/ffmpeg-soc
