diff options
| author |   Krzysztof Pawlik <nelchael@gentoo.org> | 2006-01-14 13:14:43 +0000 |
|---|---|---|
| committer | Krzysztof Pawlik <nelchael@gentoo.org> | 2006-01-14 13:14:43 +0000 |
| commit | ae689d533b7cfef6010a502bad022132966778b1 (patch) | |
| tree | dc52b6b1ebac2826da5f1807ace1c1bc4d5b56ca /x11-misc/xvidcap/files | |
| parent | Allow compiling with USE=-gsm, bug #118885. (diff) | |
| download | historical-ae689d533b7cfef6010a502bad022132966778b1.tar.gz historical-ae689d533b7cfef6010a502bad022132966778b1.tar.bz2 historical-ae689d533b7cfef6010a502bad022132966778b1.zip | |
Fix building and working with new ffmpeg (bug #115675). Deps for modular X.
Package-Manager: portage-2.1_pre3-r1
Diffstat (limited to 'x11-misc/xvidcap/files')
| -rw-r--r-- | x11-misc/xvidcap/files/digest-xvidcap-1.1.3-r2 | 1 | ||||
| -rw-r--r-- | x11-misc/xvidcap/files/xvidcap-1.1.3-new-ffmpeg.patch | 60 |
2 files changed, 61 insertions, 0 deletions
diff --git a/x11-misc/xvidcap/files/digest-xvidcap-1.1.3-r2 b/x11-misc/xvidcap/files/digest-xvidcap-1.1.3-r2 new file mode 100644 index 000000000000..545730f3eabf --- /dev/null +++ b/x11-misc/xvidcap/files/digest-xvidcap-1.1.3-r2 @@ -0,0 +1 @@ +MD5 ea896ffd35d6fe6d2abf51b38605f5fd xvidcap-1.1.3.tar.gz 1627036 diff --git a/x11-misc/xvidcap/files/xvidcap-1.1.3-new-ffmpeg.patch b/x11-misc/xvidcap/files/xvidcap-1.1.3-new-ffmpeg.patch new file mode 100644 index 000000000000..b12e324c9821 --- /dev/null +++ b/x11-misc/xvidcap/files/xvidcap-1.1.3-new-ffmpeg.patch @@ -0,0 +1,60 @@ +diff -Nru xvidcap-1.1.3.vanilla/src/xtoffmpeg.c xvidcap-1.1.3/src/xtoffmpeg.c +--- xvidcap-1.1.3.vanilla/src/xtoffmpeg.c 2006-01-14 12:20:42.000000000 +0100 ++++ xvidcap-1.1.3/src/xtoffmpeg.c 2006-01-14 13:05:06.000000000 +0100 +@@ -682,7 +682,7 @@ + exit (1); + } + +- c = &out_st->codec; ++ c = out_st->codec; + c->codec_id = transCodec; + c->codec_type = CODEC_TYPE_VIDEO; + +@@ -696,8 +696,10 @@ + #endif /* DEBUG */ + + /* frames per second */ +- c->frame_rate = job->fps; +- c->frame_rate_base = 1; ++ /*c->frame_rate = job->fps; ++ c->frame_rate_base = 1;*/ ++ c->time_base.den = job->fps * 1000; ++ c->time_base.num = 1000; + c->gop_size = 250; /* emit one intra frame every 10 frames */ + // c->me_method = ME_EPZS; + // c->debug = 0x00000FFF; +@@ -707,10 +709,13 @@ + */ + memset (p_fParams, 0, sizeof(*p_fParams)); + p_fParams->image_format = image_format; +- p_fParams->frame_rate = out_st->codec.frame_rate; ++ /*p_fParams->frame_rate = out_st->codec.frame_rate; + p_fParams->frame_rate_base = out_st->codec.frame_rate_base; + p_fParams->width = out_st->codec.width; +- p_fParams->height = out_st->codec.height; ++ p_fParams->height = out_st->codec.height;*/ ++ p_fParams->time_base = out_st->codec->time_base; ++ p_fParams->width = out_st->codec->width; ++ p_fParams->height = out_st->codec->height; + if (av_set_parameters (output_file, p_fParams) < 0) { + // if (av_set_parameters(output_file, NULL) < 0) { + fprintf (stderr, "xtoffmpeg.XImageToFFMPEG(): Invalid encoding parameters ... aborting\n"); +@@ -720,7 +725,8 @@ + /* + * open codec + */ +- c = &out_st->codec; ++ c = out_st->codec; ++ c->pix_fmt = PIX_FMT_YUV420P; + + /* find the video encoder */ + codec = avcodec_find_encoder (c->codec_id); +@@ -1159,7 +1165,7 @@ + #endif // HAVE_FFMPEG_AUDIO + + if (out_st) { +- avcodec_close (&out_st->codec); ++ avcodec_close (out_st->codec); + out_st = NULL; + } + |