Merge branch 'audio-filters' of https://github.com/ubitux/FFmpeg
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 17 May 2012 14:51:59 +0000 (16:51 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 17 May 2012 14:55:01 +0000 (16:55 +0200)
commitdc2e051c4f1c03f952b86e6741b5cf22e78b86f8
tree763aefc9e4c4bbb970ac096c4641422d04258c84
parentb13d39bd812309aad7d912b3c55da8d16dd3efe8
parent5dbd66395acc4ea85a3dd311f93f988a1c6021e8
Merge branch 'audio-filters' of https://github.com/ubitux/FFmpeg

* 'audio-filters' of https://github.com/ubitux/FFmpeg:
  lavfi/pan: add supported sample rates to avoid a crash.
  ffmpeg: do not warn when expecting EOF from lavfi.

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