Merge commit 'a6b361325f2bfc8d9d4e5f761d6c1a07b209c4fb'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 4 Oct 2013 11:47:01 +0000 (13:47 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 4 Oct 2013 11:47:06 +0000 (13:47 +0200)
commit373d15525d3de87f419f87c4c69b32c265a47310
tree651f891d8532b89de01a0588307c738feb035727
parentb46f19100b08af54056abf6fb2351f32fb0d91bd
parenta6b361325f2bfc8d9d4e5f761d6c1a07b209c4fb
Merge commit 'a6b361325f2bfc8d9d4e5f761d6c1a07b209c4fb'

* commit 'a6b361325f2bfc8d9d4e5f761d6c1a07b209c4fb':
  rtmpproto: Print the error code string if there's no description

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/rtmpproto.c