NotificationsYou must be signed in to change notification settings
Fork7.9k
Star21.4k

Commit3bdea02

Nathan Goldbaum

committed

don't attempt to use libav ffmpeg shim on ubuntu 12.04

1 parentb87772d commit3bdea02Copy full SHA for 3bdea02

File tree

2 files changed

+23

-9

lines changed

.travis.yml
lib/matplotlib
- animation.py

2 files changed

+23

-9

lines changed

`‎.travis.yml`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,6 @@ addons:`
`13`	`13`	`packages:`
`14`	`14`	`-inkscape`
`15`	`15`	`-libav-tools`
`16`		`- -libavcodec-extra-53`
`17`	`16`	`-gdb`
`18`	`17`	`-mencoder`
`19`	`18`	`-dvipng`

`‎lib/matplotlib/animation.py`

Lines changed: 23 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -400,16 +400,23 @@ def isAvailable(cls):`
`400`	`400`	`ifnotbin_path:`
`401`	`401`	`returnFalse`
`402`	`402`	`try:`
`403`		`-p=subprocess.Popen(bin_path,`
`404`		`-shell=False,`
`405`		`-stdout=subprocess.PIPE,`
`406`		`-stderr=subprocess.PIPE,`
`407`		`-creationflags=subprocess_creation_flags)`
`408`		`-p.communicate()`
	`403`	`+p=subprocess.Popen(`
	`404`	`+bin_path,`
	`405`	`+shell=False,`
	`406`	`+stdout=subprocess.PIPE,`
	`407`	`+stderr=subprocess.PIPE,`
	`408`	`+creationflags=subprocess_creation_flags)`
	`409`	`+ifnotcls._handle_subprocess(p):`
	`410`	`+returnFalse`
`409`	`411`	`returnTrue`
`410`	`412`	`exceptOSError:`
`411`	`413`	`returnFalse`
`412`	`414`
	`415`	`+@classmethod`
	`416`	`+def_handle_subprocess(cls,process):`
	`417`	`+process.communicate()`
	`418`	`+returnTrue`
	`419`	`+`
`413`	`420`
`414`	`421`	`classFileMovieWriter(MovieWriter):`
`415`	`422`	'''`MovieWriter` for writing to individual files and stitching at the end.
`@@ -584,10 +591,18 @@ def output_args(self):`
`584`	`591`
`585`	`592`	`returnargs+ ['-y',self.outfile]`
`586`	`593`
	`594`	`+@classmethod`
	`595`	`+def_handle_subprocess(cls,process):`
	`596`	`+_,err=process.communicate()`
	`597`	`+# Ubuntu 12.04 ships a broken ffmpeg binary which we shouldn't use`
	`598`	`+if'Libav'inerr.decode():`
	`599`	`+returnFalse`
	`600`	`+returnTrue`
	`601`	`+`
`587`	`602`
`588`	`603`	`# Combine FFMpeg options with pipe-based writing`
`589`	`604`	`@writers.register('ffmpeg')`
`590`		`-classFFMpegWriter(MovieWriter,FFMpegBase):`
	`605`	`+classFFMpegWriter(FFMpegBase,MovieWriter):`
`591`	`606`	`'''Pipe-based ffmpeg writer.`
`592`	`607`
`593`	`608`	`Frames are streamed directly to ffmpeg via a pipe and written in a single`
`@@ -608,7 +623,7 @@ def _args(self):`
`608`	`623`
`609`	`624`	`# Combine FFMpeg options with temp file-based writing`
`610`	`625`	`@writers.register('ffmpeg_file')`
`611`		`-classFFMpegFileWriter(FileMovieWriter,FFMpegBase):`
	`626`	`+classFFMpegFileWriter(FFMpegBase,FileMovieWriter):`
`612`	`627`	`'''File-based ffmpeg writer.`
`613`	`628`
`614`	`629`	`Frames are written to temporary files on disk and then stitched`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit3bdea02

File tree

2 files changed

2 files changed

`‎.travis.yml`

`‎lib/matplotlib/animation.py`

0 commit comments