Merge commit '06cd4c5a68e23f5be199c0d2d563da80989f839f'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Aug 2013 07:20:05 +0000 (09:20 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Aug 2013 07:20:22 +0000 (09:20 +0200)
* commit '06cd4c5a68e23f5be199c0d2d563da80989f839f':
  avconv: fix usage of deprecated lavfi API

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

diff --cc ffmpeg_filter.c
Simple merge