Commit8e517d8

authored

Merge pull request#8743 from ElieGouzien/fix-anim-avconv

Fix 'animation' unable to detect AVConv.

2 parentsd526105 +e99096c commit8e517d8Copy full SHA for 8e517d8

File tree

-0

lines changed

-0

lines changed

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+AVConv writer is back`
	`2`	`+---------------------`
	`3`	`+Correct a bug that prevented detection of AVconv for matplotlib.animation.`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -616,6 +616,7 @@ def output_args(self):`
`616`	`616`	`def_handle_subprocess(cls,process):`
`617`	`617`	`_,err=process.communicate()`
`618`	`618`	`# Ubuntu 12.04 ships a broken ffmpeg binary which we shouldn't use`
	`619`	`+# NOTE : when removed, remove the same method in AVConvBase.`
`619`	`620`	`if'Libav'inerr.decode():`
`620`	`621`	`returnFalse`
`621`	`622`	`returnTrue`
`@@ -674,6 +675,11 @@ class AVConvBase(FFMpegBase):`
`674`	`675`	`exec_key='animation.avconv_path'`
`675`	`676`	`args_key='animation.avconv_args'`
`676`	`677`
	`678`	`+# NOTE : should be removed when the same method is removed in FFMpegBase.`
	`679`	`+@classmethod`
	`680`	`+def_handle_subprocess(cls,process):`
	`681`	`+returnMovieWriter._handle_subprocess(process)`
	`682`	`+`
`677`	`683`
`678`	`684`	`# Combine AVConv options with pipe-based writing`
`679`	`685`	`@writers.register('avconv')`

Comments

(0)