[FFmpeg-cvslog] Merge commit '06cd4c5a68e23f5be199c0d2d563da80989f839f'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Aug  6 09:20:05 2013 +0200| [a59a64cbc85375b7a6a0266c62f654e2ea80a5c6] | committer: Michael Niedermayer

Merge commit '06cd4c5a68e23f5be199c0d2d563da80989f839f'

* commit '06cd4c5a68e23f5be199c0d2d563da80989f839f':
  avconv: fix usage of deprecated lavfi API

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

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