Merge commit '33f28a3be3092f642778253d9529dd66fe2a014a'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 1 Jan 2013 12:54:12 +0000 (13:54 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 1 Jan 2013 12:54:22 +0000 (13:54 +0100)
commitc047a41bc5ff113bd9c7e010cf617c2589879720
treeb406d548d4befa4817bca676da7d1a22a108d2b9
parentd079d1d368a96e70ae76da7ad483b486fef2a8d2
parent33f28a3be3092f642778253d9529dd66fe2a014a
Merge commit '33f28a3be3092f642778253d9529dd66fe2a014a'

* commit '33f28a3be3092f642778253d9529dd66fe2a014a':
  rtmp: Add a function for writing AMF strings based on two substrings
  rtmp: Return a proper error code in handle_invoke_error

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