Merge commit 'c802a2e718fb3619291f310f851f1a1cdcf4f581'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 17 Oct 2014 11:47:49 +0000 (13:47 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 17 Oct 2014 11:47:49 +0000 (13:47 +0200)
commit1dd38e99fd1263f112825045eb69a6b041d5bc97
tree84650b1ea0fc972f4df6c6c71ed1117b4fed903b
parent9d1155dae303c20f51ae8579df1b8c3928c3bf21
parentc802a2e718fb3619291f310f851f1a1cdcf4f581
Merge commit 'c802a2e718fb3619291f310f851f1a1cdcf4f581'

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

Conflicts:
ffmpeg_filter.c

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