head 1.2; access; symbols pkgsrc-2013Q2:1.2.0.34 pkgsrc-2013Q2-base:1.2 pkgsrc-2012Q4:1.2.0.32 pkgsrc-2012Q4-base:1.2 pkgsrc-2011Q4:1.2.0.30 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q2:1.2.0.28 pkgsrc-2011Q2-base:1.2 pkgsrc-2009Q4:1.2.0.26 pkgsrc-2009Q4-base:1.2 pkgsrc-2008Q4:1.2.0.24 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.22 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.20 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.18 pkgsrc-2008Q2-base:1.2 pkgsrc-2008Q1:1.2.0.16 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.14 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.12 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.10 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.8 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.6 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.4 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.2 pkgsrc-2006Q2-base:1.2; locks; strict; comment @# @; 1.2 date 2006.05.17.05.06.28; author reed; state dead; branches; next 1.1; 1.1 date 2006.05.17.01.53.17; author reed; state Exp; branches; next ; desc @@ 1.2 log @Get rid of xvidcap-gtk2 patches and distinfo. Used shared info from x11/xvidcap instead. (For the gtk2 version only patch addition is include of sys/time/.h) patch-ae adjusted to work with both packages. @ text @$NetBSD: patch-ag,v 1.1 2006/05/17 01:53:17 reed Exp $ --- src/xtoffmpeg.c.orig 2006-04-21 07:54:06.000000000 +0000 +++ src/xtoffmpeg.c @@@@ -582,6 +582,7 @@@@ XImageToFFMPEG (FILE *fp, XImage *image, AVFormatParameters fParams, *p_fParams = &fParams; // video stream params AVFormatParameters params, *ap = ¶ms; // audio stream params AVImageFormat *image_format; + AVPacket pkt; int ret, err, i; #ifdef DEBUG @@@@ -1103,7 +1104,8 @@@@ XImageToFFMPEG (FILE *fp, XImage *image, #endif /* DEBUG */ /* encode the image */ - out_size = avcodec_encode_video (c, outbuf, image_size, frame); + av_init_packet(&pkt); + pkt.size = avcodec_encode_video (c, outbuf, image_size, frame); #ifdef HAVE_FFMPEG_AUDIO if (job->flags & FLG_AUDIO_WANTED) { @@@@ -1117,7 +1119,13 @@@@ XImageToFFMPEG (FILE *fp, XImage *image, } #endif // HAVE_FFMPEG_AUDIO /* write frame to file */ - av_write_frame (output_file, out_st->index, outbuf, out_size); + + pkt.pts= c->coded_frame->pts; + pkt.flags |= PKT_FLAG_KEY; + pkt.stream_index= out_st->index; + pkt.data= outbuf; + + av_write_frame (output_file, &pkt); #ifdef HAVE_FFMPEG_AUDIO /* release the mutex */ if (job->flags & FLG_AUDIO_WANTED) { @ 1.1 log @Add patch for ffmpeg update. And update patch for png update. Thank you Joerg! Bump PKREVISION for these. Also use --without-forced-embedded-ffmpeg (even though it is the default when the ffmpeg is detected). TODO: just use a common patches directory for these two packages. @ text @d1 1 a1 1 $NetBSD$ @