[FFmpeg-cvslog] Merge commit 'a6b361325f2bfc8d9d4e5f761d6c1a07b209c4fb'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Oct  4 13:47:01 2013 +0200| [373d15525d3de87f419f87c4c69b32c265a47310] | committer: Michael Niedermayer

Merge commit 'a6b361325f2bfc8d9d4e5f761d6c1a07b209c4fb'

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

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

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