diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-01 13:54:12 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-01 13:54:22 +0100 |
| commit | c047a41bc5ff113bd9c7e010cf617c2589879720 (patch) | |
| tree | b406d548d4befa4817bca676da7d1a22a108d2b9 /libavformat/rtmpproto.c | |
| parent | d079d1d368a96e70ae76da7ad483b486fef2a8d2 (diff) | |
| parent | 33f28a3be3092f642778253d9529dd66fe2a014a (diff) | |
| download | ffmpeg-c047a41bc5ff113bd9c7e010cf617c2589879720.tar.gz | |
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>
Diffstat (limited to 'libavformat/rtmpproto.c')
| -rw-r--r-- | libavformat/rtmpproto.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c index 72462cf703..9b60be84c6 100644 --- a/libavformat/rtmpproto.c +++ b/libavformat/rtmpproto.c @@ -1530,7 +1530,7 @@ static int handle_invoke_error(URLContext *s, RTMPPacket *pkt) level = AV_LOG_WARNING; ret = 0; } else - ret = -1; + ret = AVERROR_UNKNOWN; av_log(s, level, "Server error: %s\n", tmpstr); } |