Re: [FFmpeg-devel] [PATCH 5/5] Use ff_rtsp_averror()

2014-10-20 Thread Michael Niedermayer 
On Sat, Oct 18, 2014 at 12:24:03AM +0400, Andrey Utkin wrote:
 ---
  libavformat/rtsp.c|  4 ++--
  libavformat/rtspdec.c | 27 ++-
  libavformat/rtspenc.c |  4 ++--
  3 files changed, 18 insertions(+), 17 deletions(-)

applied

thanks

[...]
-- 
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

The misfortune of the wise is better than the prosperity of the fool.
-- Epicurus


signature.asc
Description: Digital signature
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

[FFmpeg-devel] [PATCH 5/5] Use ff_rtsp_averror()

2014-10-17 Thread Andrey Utkin 
---
 libavformat/rtsp.c|  4 ++--
 libavformat/rtspdec.c | 27 ++-
 libavformat/rtspenc.c |  4 ++--
 3 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
index 77f03ba..1682db8 100644
--- a/libavformat/rtsp.c
+++ b/libavformat/rtsp.c
@@ -1478,7 +1478,7 @@ int ff_rtsp_make_setup_request(AVFormatContext *s, const 
char *host, int port,
 goto fail;
 } else if (reply-status_code != RTSP_STATUS_OK ||
reply-nb_transports != 1) {
-err = AVERROR_INVALIDDATA;
+err = ff_rtsp_averror(reply-status_code, AVERROR_INVALIDDATA);
 goto fail;
 }
 
@@ -1778,7 +1778,7 @@ redirect:
sizeof(cmd));
 ff_rtsp_send_cmd(s, OPTIONS, rt-control_uri, cmd, reply, NULL);
 if (reply-status_code != RTSP_STATUS_OK) {
-err = AVERROR_INVALIDDATA;
+err = ff_rtsp_averror(reply-status_code, AVERROR_INVALIDDATA);
 goto fail;
 }
 
diff --git a/libavformat/rtspdec.c b/libavformat/rtspdec.c
index cf073b3..cad8de3 100644
--- a/libavformat/rtspdec.c
+++ b/libavformat/rtspdec.c
@@ -532,7 +532,7 @@ static int rtsp_read_play(AVFormatContext *s)
 }
 ff_rtsp_send_cmd(s, PLAY, rt-control_uri, cmd, reply, NULL);
 if (reply-status_code != RTSP_STATUS_OK) {
-return -1;
+return ff_rtsp_averror(reply-status_code, -1);
 }
 if (rt-transport == RTSP_TRANSPORT_RTP 
 reply-range_start != AV_NOPTS_VALUE) {
@@ -564,7 +564,7 @@ static int rtsp_read_pause(AVFormatContext *s)
 else if (!(rt-server_type == RTSP_SERVER_REAL  rt-need_subscription)) {
 ff_rtsp_send_cmd(s, PAUSE, rt-control_uri, NULL, reply, NULL);
 if (reply-status_code != RTSP_STATUS_OK) {
-return -1;
+return ff_rtsp_averror(reply-status_code, -1);
 }
 }
 rt-state = RTSP_STATE_PAUSED;
@@ -591,12 +591,12 @@ int ff_rtsp_setup_input_streams(AVFormatContext *s, 
RTSPMessageHeader *reply)
sizeof(cmd));
 }
 ff_rtsp_send_cmd(s, DESCRIBE, rt-control_uri, cmd, reply, content);
-if (!content)
-return AVERROR_INVALIDDATA;
 if (reply-status_code != RTSP_STATUS_OK) {
 av_freep(content);
-return AVERROR_INVALIDDATA;
+return ff_rtsp_averror(reply-status_code, AVERROR_INVALIDDATA);
 }
+if (!content)
+return AVERROR_INVALIDDATA;
 
 av_log(s, AV_LOG_VERBOSE, SDP:\n%s\n, content);
 /* now we got the SDP description, we parse it */
@@ -717,10 +717,10 @@ static int rtsp_read_header(AVFormatContext *s)
 if (rt-initial_pause) {
 /* do not start immediately */
 } else {
-if (rtsp_read_play(s)  0) {
+if ((ret = rtsp_read_play(s))  0) {
 ff_rtsp_close_streams(s);
 ff_rtsp_close_connections(s);
-return AVERROR_INVALIDDATA;
+return ret;
 }
 }
 }
@@ -814,7 +814,7 @@ retry:
 ff_rtsp_send_cmd(s, SET_PARAMETER, rt-control_uri,
  cmd, reply, NULL);
 if (reply-status_code != RTSP_STATUS_OK)
-return AVERROR_INVALIDDATA;
+return ff_rtsp_averror(reply-status_code, 
AVERROR_INVALIDDATA);
 rt-need_subscription = 1;
 }
 }
@@ -849,7 +849,7 @@ retry:
 ff_rtsp_send_cmd(s, SET_PARAMETER, rt-control_uri,
  cmd, reply, NULL);
 if (reply-status_code != RTSP_STATUS_OK)
-return AVERROR_INVALIDDATA;
+return ff_rtsp_averror(reply-status_code, 
AVERROR_INVALIDDATA);
 rt-need_subscription = 0;
 
 if (rt-state == RTSP_STATE_STREAMING)
@@ -910,6 +910,7 @@ static int rtsp_read_seek(AVFormatContext *s, int 
stream_index,
   int64_t timestamp, int flags)
 {
 RTSPState *rt = s-priv_data;
+int ret;
 
 rt-seek_timestamp = av_rescale_q(timestamp,
   s-streams[stream_index]-time_base,
@@ -919,11 +920,11 @@ static int rtsp_read_seek(AVFormatContext *s, int 
stream_index,
 case RTSP_STATE_IDLE:
 break;
 case RTSP_STATE_STREAMING:
-if (rtsp_read_pause(s) != 0)
-return -1;
+if ((ret = rtsp_read_pause(s)) != 0)
+return ret;
 rt-state = RTSP_STATE_SEEKING;
-if (rtsp_read_play(s) != 0)
-return -1;
+if ((ret = rtsp_read_play(s)) != 0)
+return ret;
 break;
 case RTSP_STATE_PAUSED:
 rt-state = RTSP_STATE_IDLE;
diff --git a/libavformat/rtspenc.c b/libavformat/rtspenc.c
index 12fb410..e7707bb 100644
--- a/libavformat/rtspenc.c
+++ b/libavformat/rtspenc.c
@@ -84,7 +84,7 @@ int ff_rtsp_setup_output_streams(AVFormatContext *s, const 
char *addr)