Merge commit 'cb0244daaca83ab666798818f74f5181bf6bc387'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 10 Aug 2013 08:29:40 +0000 (10:29 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 10 Aug 2013 08:29:44 +0000 (10:29 +0200)
commite3a296dfa53ba78360d7f2c8c931db3490b06d5b
tree1eecd114d71778c3cd5637731047e6e5e5acdba1
parent09f1afc784b4bb5f6e861ac991817ed06effbd5d
parentcb0244daaca83ab666798818f74f5181bf6bc387
Merge commit 'cb0244daaca83ab666798818f74f5181bf6bc387'

* commit 'cb0244daaca83ab666798818f74f5181bf6bc387':
  bktr: Changed a missed occurrance of open into avpriv_open

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavdevice/bktr.c