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)
* commit 'c802a2e718fb3619291f310f851f1a1cdcf4f581':
  avconv: fix leak in filter error

Conflicts:
ffmpeg_filter.c

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

diff --cc ffmpeg_filter.c
Simple merge