Merge commit 'b512360184ade835fba621f5042d643fc9e2ee9d'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 27 Jul 2013 07:05:26 +0000 (09:05 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 27 Jul 2013 07:06:21 +0000 (09:06 +0200)
commit103b8d876a86d0ccb7a8862568d5aa1696863606
treeb6ccbd3a51e6fbf7cf64954dd75157b2c808faa5
parent5cb3d35dcc239d319229dc453f3acc4486d26577
parentb512360184ade835fba621f5042d643fc9e2ee9d
Merge commit 'b512360184ade835fba621f5042d643fc9e2ee9d'

* commit 'b512360184ade835fba621f5042d643fc9e2ee9d':
  avio: Don't set the seekable flag if no seek function is provided

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