packages (AC-branch): ffmpeg/ffmpeg.spec, ffmpeg/imagewidth.patch (NEW) - a...
glen
glen at pld-linux.org
Thu Jul 16 11:10:54 CEST 2009
Author: glen Date: Thu Jul 16 09:10:54 2009 GMT
Module: packages Tag: AC-branch
---- Log message:
- add -X and -Y options for specifying thumb size; rel 4
---- Files affected:
packages/ffmpeg:
ffmpeg.spec (1.152.2.4 -> 1.152.2.5) , imagewidth.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/ffmpeg/ffmpeg.spec
diff -u packages/ffmpeg/ffmpeg.spec:1.152.2.4 packages/ffmpeg/ffmpeg.spec:1.152.2.5
--- packages/ffmpeg/ffmpeg.spec:1.152.2.4 Wed Jul 1 12:27:50 2009
+++ packages/ffmpeg/ffmpeg.spec Thu Jul 16 11:10:48 2009
@@ -9,7 +9,7 @@
#
%define _snap 2007-10-09
%define snap %(echo %{_snap} | tr -d -)
-%define rel 3
+%define rel 4
Summary: Realtime audio/video encoder and streaming server
Summary(pl.UTF-8): Koder audio/wideo czasu rzeczywistego oraz serwer strumieni
Name: ffmpeg
@@ -31,6 +31,7 @@
Patch3: %{name}-pkgconfig-lib64.patch
Patch4: %{name}-gcc3.patch
Patch5: qt-faststart-off_t.patch
+Patch6: imagewidth.patch
URL: http://ffmpeg.mplayerhq.hu/
BuildRequires: SDL-devel
BuildRequires: a52dec-libs-devel
@@ -212,6 +213,7 @@
%endif
%patch4 -p1
%patch5 -p1
+%patch6 -p0
%build
# notes:
@@ -373,6 +375,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.152.2.5 2009/07/16 09:10:48 glen
+- add -X and -Y options for specifying thumb size; rel 4
+
Revision 1.152.2.4 2009/07/01 10:27:50 glen
- add qt-faststart program
- package ghost soname symlinks; rel 3
================================================================
Index: packages/ffmpeg/imagewidth.patch
diff -u /dev/null packages/ffmpeg/imagewidth.patch:1.1
--- /dev/null Thu Jul 16 11:10:54 2009
+++ packages/ffmpeg/imagewidth.patch Thu Jul 16 11:10:49 2009
@@ -0,0 +1,113 @@
+http://lists.mplayerhq.hu/pipermail/ffmpeg-devel/2009-July/072472.html
+
+--- vhook/imlib2.orig.c 2007-08-07 05:43:50.000000000 +0300
++++ vhook/imlib2.c 2009-07-07 08:20:59.935830867 +0300
+@@ -84,12 +84,12 @@
+ AVEvalExpr *eval_r, *eval_g, *eval_b, *eval_a;
+ char *expr_R, *expr_G, *expr_B, *expr_A;
+ int eval_colors;
+- double x, y;
++ double x, y, X, Y;
+ char *fileImage;
+ struct _CachedImage *cache;
+ Imlib_Image imageOverlaid;
+- AVEvalExpr *eval_x, *eval_y;
+- char *expr_x, *expr_y;
++ AVEvalExpr *eval_x, *eval_y, *eval_X, *eval_Y;
++ char *expr_x, *expr_y, *expr_X, *expr_Y;
+ int frame_number;
+ int imageOverlaid_width, imageOverlaid_height;
+
+@@ -123,6 +123,8 @@
+ }
+ ff_eval_free(ci->eval_x);
+ ff_eval_free(ci->eval_y);
++ ff_eval_free(ci->eval_X);
++ ff_eval_free(ci->eval_Y);
+ ff_eval_free(ci->eval_r);
+ ff_eval_free(ci->eval_g);
+ ff_eval_free(ci->eval_b);
+@@ -130,6 +132,8 @@
+
+ av_free(ci->expr_x);
+ av_free(ci->expr_y);
++ av_free(ci->expr_X);
++ av_free(ci->expr_Y);
+ av_free(ci->expr_R);
+ av_free(ci->expr_G);
+ av_free(ci->expr_B);
+@@ -157,8 +161,12 @@
+
+ ci->x = 0.0;
+ ci->y = 0.0;
++ ci->X = 0.0;
++ ci->Y = 0.0;
+ ci->expr_x = "0.0";
+ ci->expr_y = "0.0";
++ ci->expr_X = "0.0";
++ ci->expr_Y = "0.0";
+
+ optind = 0;
+
+@@ -173,7 +181,7 @@
+ imlib_add_path_to_font_path(fp);
+
+
+- while ((c = getopt(argc, argv, "R:G:B:A:C:c:f:F:t:x:y:i:")) > 0) {
++ while ((c = getopt(argc, argv, "R:G:B:A:C:c:f:F:t:x:y:i:X:Y:")) > 0) {
+ switch (c) {
+ case 'R':
+ ci->expr_R = av_strdup(optarg);
+@@ -211,6 +219,12 @@
+ case 'y':
+ ci->expr_y = av_strdup(optarg);
+ break;
++ case 'X':
++ ci->expr_X = av_strdup(optarg);
++ break;
++ case 'Y':
++ ci->expr_Y = av_strdup(optarg);
++ break;
+ case 'i':
+ ci->fileImage = av_strdup(optarg);
+ break;
+@@ -316,6 +330,16 @@
+ ci->imageOverlaid_height = imlib_image_get_height();
+ }
+
++ if (!(ci->eval_X = ff_parse(ci->expr_X, const_names, NULL, NULL, NULL, NULL, &error))){
++ av_log(NULL, AV_LOG_ERROR, "Couldn't parse X expression '%s': %s\n", ci->expr_X, error);
++ return -1;
++ }
++
++ if (!(ci->eval_Y = ff_parse(ci->expr_Y, const_names, NULL, NULL, NULL, NULL, &error))){
++ av_log(NULL, AV_LOG_ERROR, "Couldn't parse Y expression '%s': %s\n", ci->expr_Y, error);
++ return -1;
++ }
++
+ if (!(ci->eval_x = ff_parse(ci->expr_x, const_names, NULL, NULL, NULL, NULL, &error))){
+ av_log(NULL, AV_LOG_ERROR, "Couldn't parse x expression '%s': %s\n", ci->expr_x, error);
+ return -1;
+@@ -438,6 +462,8 @@
+ ci->x = ff_parse_eval(ci->eval_x, const_values, ci);
+ ci->y = ff_parse_eval(ci->eval_y, const_values, ci);
+ y = ci->y;
++ ci->X = ff_parse_eval(ci->eval_X, const_values, ci);
++ ci->Y = ff_parse_eval(ci->eval_Y, const_values, ci);
+
+ if (ci->eval_a) {
+ ci->a = ff_parse_eval(ci->eval_a, const_values, ci);
+@@ -464,10 +490,12 @@
+ }
+
+ if (ci->imageOverlaid) {
++ if (ci->X == 0) ci->X = ci->imageOverlaid_width;
++ if (ci->Y == 0) ci->Y = ci->imageOverlaid_height;
+ imlib_context_set_image(image);
+ imlib_blend_image_onto_image(ci->imageOverlaid, 0,
+ 0, 0, ci->imageOverlaid_width, ci->imageOverlaid_height,
+- ci->x, ci->y, ci->imageOverlaid_width, ci->imageOverlaid_height);
++ ci->x, ci->y, ci->X, ci->Y);
+ }
+
+ }
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ffmpeg/ffmpeg.spec?r1=1.152.2.4&r2=1.152.2.5&f=u
More information about the pld-cvs-commit
mailing list