[FFmpeg-cvslog] Merge commit 'c802a2e718fb3619291f310f851f1a1cdcf4f581'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Oct 17 13:47:49 2014 +0200| [1dd38e99fd1263f112825045eb69a6b041d5bc97] | committer: Michael Niedermayer

Merge commit 'c802a2e718fb3619291f310f851f1a1cdcf4f581'

* commit 'c802a2e718fb3619291f310f851f1a1cdcf4f581':
  avconv: fix leak in filter error

Conflicts:
	ffmpeg_filter.c

See: 14369f59c5ad1fb817fb4d94073f31cccf12b556
Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1dd38e99fd1263f112825045eb69a6b041d5bc97
---