[FFmpeg-cvslog] Merge commit 'cb0244daaca83ab666798818f74f5181bf6bc387'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Aug 10 10:29:40 2013 +0200| [e3a296dfa53ba78360d7f2c8c931db3490b06d5b] | committer: Michael Niedermayer

Merge commit 'cb0244daaca83ab666798818f74f5181bf6bc387'

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

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e3a296dfa53ba78360d7f2c8c931db3490b06d5b
---