Merge commit '043ea6f7bfc59399b6b3659da785ec4cc68a008e'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 29 Oct 2014 20:41:59 +0000 (21:41 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 29 Oct 2014 20:43:25 +0000 (21:43 +0100)
commit265c4771cc764372104ba8f6abfdde9239f4c0ad
tree19dddc4c7e16a5a314700c295a0793722679df2c
parent9a534eda4608b76fa0c958e876025b2c639aeb63
parent043ea6f7bfc59399b6b3659da785ec4cc68a008e
Merge commit '043ea6f7bfc59399b6b3659da785ec4cc68a008e'

* commit '043ea6f7bfc59399b6b3659da785ec4cc68a008e':
  fbdev: Use av_strerror

Conflicts:
libavdevice/fbdev_dec.c

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