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)
commita59a64cbc85375b7a6a0266c62f654e2ea80a5c6
tree055b7cd9372359de17c709075e8e8fe0b29b05b9
parent4131f21f7761d911e5e1b1f44068b652872e454f
parent06cd4c5a68e23f5be199c0d2d563da80989f839f
Merge commit '06cd4c5a68e23f5be199c0d2d563da80989f839f'

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

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