Skip to content
Snippets Groups Projects
Commit e97a9666 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

Merge commit '81ef4602' 


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

Conflicts:
	libavdevice/bktr.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 815daf16 81ef4602
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 22 additions and 10 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment