Merge remote-tracking branch 'cigaes/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 20 Feb 2014 01:53:36 +0000 (02:53 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 20 Feb 2014 01:53:39 +0000 (02:53 +0100)
commitcbd9cc5997ec728a5c92b6cafe57412d5869ec74
treec6fb052d573ca16eb2e6ebba056730edd811b2da
parent8f33810ed26f09a2cac6781008fa174c62dbf35d
parent6c27aea8116303e9c003ff94bbd604db0f7c08e0
Merge remote-tracking branch 'cigaes/master'

* cigaes/master:
  lavfi/pan: use extended_data instead of data.

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