Merge commit '81ef46020fa654720e3beb4f5551ba634fae262a'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 16 Feb 2015 01:56:17 +0000 (02:56 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 16 Feb 2015 01:56:17 +0000 (02:56 +0100)
commite97a9666ef4511cc34637dc7b064b0a6a4565d0f
treedf367f3c79346ee993f3d965fe80a71ea9bad4d1
parent815daf1607b0dc5e471a0de1132767f60c8a6fd2
parent81ef46020fa654720e3beb4f5551ba634fae262a
Merge commit '81ef46020fa654720e3beb4f5551ba634fae262a'

* commit '81ef46020fa654720e3beb4f5551ba634fae262a':
  bktr: Use av_strerror and propagate error codes

Conflicts:
libavdevice/bktr.c

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