Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavformat / librtmp.c

diff --git a/libavformat/librtmp.c b/libavformat/librtmp.c
index 883ecdfd80262b35cc7749ac5a1213a076617d83..5b4c39dde5cc67f2c25a8e30f01c235c09b7c781 100644 (file)
--- a/libavformat/librtmp.c
+++ b/libavformat/librtmp.c
@@ -2,20 +2,20 @@
  * RTMP network protocol
  * Copyright (c) 2010 Howard Chu
  *
- * This file is part of Libav.
+ * This file is part of FFmpeg.
  *
- * Libav is free software; you can redistribute it and/or
+ * FFmpeg is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *
- * Libav is distributed in the hope that it will be useful,
+ * FFmpeg is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
+ * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
@@ -117,7 +117,7 @@ static int rtmp_open(URLContext *s, const char *uri, int flags)
 
     RTMP_Init(r);
     if (!RTMP_SetupURL(r, filename)) {
-        rc = -1;
+        rc = AVERROR_UNKNOWN;
         goto fail;
     }
 
@@ -125,7 +125,7 @@ static int rtmp_open(URLContext *s, const char *uri, int flags)
         RTMP_EnableWrite(r);
 
     if (!RTMP_Connect(r, NULL) || !RTMP_ConnectStream(r, 0)) {
-        rc = -1;
+        rc = AVERROR_UNKNOWN;
         goto fail;
     }
 
@@ -159,7 +159,7 @@ static int rtmp_read_pause(URLContext *s, int pause)
     RTMP *r = &ctx->rtmp;
 
     if (!RTMP_Pause(r, pause))
-        return -1;
+        return AVERROR_UNKNOWN;
     return 0;
 }
 
@@ -178,7 +178,7 @@ static int64_t rtmp_read_seek(URLContext *s, int stream_index,
             flags & AVSEEK_FLAG_BACKWARD ? AV_ROUND_DOWN : AV_ROUND_UP);
 
     if (!RTMP_SendSeek(r, timestamp))
-        return -1;
+        return AVERROR_UNKNOWN;
     return timestamp;
 }