summaryrefslogtreecommitdiff
path: root/community/python-matplotlib/ffmpeg-2.0.patch
blob: e9c12e911e37f9fe8ed43d1d51f8e62b22fece21 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
From 1935f1273aef443895a4da4e5f2c4aa86103a414 Mon Sep 17 00:00:00 2001
From: Vlad Seghete <vlad.seghete@gmail.com>
Date: Mon, 25 Nov 2013 13:35:57 -0600
Subject: [PATCH 1/3] fixes issue #2482 and adds note about incompatibility
 between bbox options and animation backends

---
 lib/matplotlib/animation.py | 8 ++++----
 matplotlibrc.template       | 4 ++++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/lib/matplotlib/animation.py b/lib/matplotlib/animation.py
index 295d60d..9078c5d 100644
--- a/lib/matplotlib/animation.py
+++ b/lib/matplotlib/animation.py
@@ -399,9 +399,9 @@ class FFMpegFileWriter(FileMovieWriter, FFMpegBase):
     def _args(self):
         # Returns the command line parameters for subprocess to use
         # ffmpeg to create a movie using a collection of temp images
-        return [self.bin_path(), '-vframes', str(self._frame_counter),
-                '-r', str(self.fps), '-i',
-                self._base_temp_name()] + self.output_args
+        return [self.bin_path(), '-i', self._base_temp_name()-vframes,
+                '-vframes', str(self._frame_counter),
+                '-r', str(self.fps), ] + self.output_args
 
 
 # Base class of avconv information.  AVConv has identical arguments to
diff --git a/matplotlibrc.template b/matplotlibrc.template
index 473d624..e4d3593 100644
--- a/matplotlibrc.template
+++ b/matplotlibrc.template
@@ -380,6 +380,10 @@ backend      : %(backend)s
 #savefig.edgecolor   : white    # figure edgecolor when saving
 #savefig.format      : png      # png, ps, pdf, svg
 #savefig.bbox        : standard # 'tight' or 'standard'.
+                                # 'tight' is incompatible with pipe-based animation
+                                # backends but will workd with temporary file based ones:
+                                # e.g. setting animation.writer to ffmpeg will not work,
+                                # use ffmpeg_file instead
 #savefig.pad_inches  : 0.1      # Padding to be used when bbox is set to 'tight'
 #savefig.jpeg_quality: 95       # when a jpeg is saved, the default quality parameter.
 #savefig.directory   : ~        # default directory in savefig dialog box,
-- 
1.8.5.1


From f38fcb392d1d247b933f00e65022892007fb8325 Mon Sep 17 00:00:00 2001
From: Vlad Seghete <vlad.seghete@gmail.com>
Date: Mon, 25 Nov 2013 13:52:53 -0600
Subject: [PATCH 2/3] fixed a typo

---
 lib/matplotlib/animation.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/matplotlib/animation.py b/lib/matplotlib/animation.py
index 9078c5d..07c6d27 100644
--- a/lib/matplotlib/animation.py
+++ b/lib/matplotlib/animation.py
@@ -399,7 +399,7 @@ class FFMpegFileWriter(FileMovieWriter, FFMpegBase):
     def _args(self):
         # Returns the command line parameters for subprocess to use
         # ffmpeg to create a movie using a collection of temp images
-        return [self.bin_path(), '-i', self._base_temp_name()-vframes,
+        return [self.bin_path(), '-i', self._base_temp_name(),
                 '-vframes', str(self._frame_counter),
                 '-r', str(self.fps), ] + self.output_args
 
-- 
1.8.5.1


From 5c8f3d605ff045ddfbc3ca950aef85366617af5a Mon Sep 17 00:00:00 2001
From: Vlad Seghete <vlad.seghete@gmail.com>
Date: Mon, 25 Nov 2013 14:17:54 -0600
Subject: [PATCH 3/3] fixed another typo

---
 lib/matplotlib/animation.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/matplotlib/animation.py b/lib/matplotlib/animation.py
index 07c6d27..9854ca2 100644
--- a/lib/matplotlib/animation.py
+++ b/lib/matplotlib/animation.py
@@ -401,7 +401,7 @@ def _args(self):
         # ffmpeg to create a movie using a collection of temp images
         return [self.bin_path(), '-i', self._base_temp_name(),
                 '-vframes', str(self._frame_counter),
-                '-r', str(self.fps), ] + self.output_args
+                '-r', str(self.fps)] + self.output_args
 
 
 # Base class of avconv information.  AVConv has identical arguments to
-- 
1.8.5.1