[FFmpeg-soc] [soc]: r920 - libavfilter/ffmpeg.diff
koorogi
subversion at mplayerhq.hu
Fri Aug 17 20:32:44 CEST 2007
Author: koorogi
Date: Fri Aug 17 20:32:44 2007
New Revision: 920
Log:
Update ffplay for picture permission handling changes.
Modified:
libavfilter/ffmpeg.diff
Modified: libavfilter/ffmpeg.diff
==============================================================================
--- libavfilter/ffmpeg.diff (original)
+++ libavfilter/ffmpeg.diff Fri Aug 17 20:32:44 2007
@@ -208,7 +208,7 @@ Index: ffplay.c
if(pkt->data == flush_pkt.data){
avcodec_flush_buffers(is->video_st->codec);
continue;
-@@ -1361,31 +1396,216 @@
+@@ -1361,31 +1396,217 @@
/* NOTE: ipts is the PTS of the _first_ picture beginning in
this packet, if any */
global_video_pkt_pts= pkt->pts;
@@ -285,7 +285,7 @@ Index: ffplay.c
+ picref->pic->format, picref->w, picref->h);
+
+ picref->pts = pts;
-+ avfilter_start_frame(link, avfilter_ref_pic(picref, ~0));
++ avfilter_start_frame(link, avfilter_ref_pic(picref, link->dst, ~0));
+ avfilter_draw_slice(link, 0, picref->h);
+ avfilter_end_frame(link);
+ avfilter_unref_pic(picref);
@@ -368,7 +368,8 @@ Index: ffplay.c
+ .inputs = (AVFilterPad[]) {{ .name = "default",
+ .type = AV_PAD_VIDEO,
+ .end_frame = output_end_frame,
-+ .query_formats = output_query_formats, },
++ .query_formats = output_query_formats,
++ .min_perms = AV_PERM_READ, },
+ { .name = NULL }},
+ .outputs = (AVFilterPad[]) {{ .name = NULL }},
+};
@@ -437,7 +438,7 @@ Index: ffplay.c
av_free(frame);
return 0;
}
-@@ -2136,6 +2356,12 @@
+@@ -2136,6 +2357,12 @@
/* free all pictures */
for(i=0;i<VIDEO_PICTURE_QUEUE_SIZE; i++) {
vp = &is->pictq[i];
@@ -450,7 +451,7 @@ Index: ffplay.c
if (vp->bmp) {
SDL_FreeYUVOverlay(vp->bmp);
vp->bmp = NULL;
-@@ -2488,6 +2714,9 @@
+@@ -2488,6 +2715,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