[SCM] libav/experimental: Remove useless "else" case in if X { A; return }; else { B }. See discussion in "Realmedia patch" thread on mailinglist.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 5f86057ffd534abb42fada9f0abf88409f6b51d2
Author: Ronald S. Bultje <rsbultje at gmail.com>
Date:   Mon Sep 1 13:51:24 2008 +0000

    Remove useless "else" case in if X { A; return }; else { B }. See discussion
    in "Realmedia patch" thread on mailinglist.
    
    Originally committed as revision 15142 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
index 0c60b83..33aa894 100644
--- a/libavformat/rtsp.c
+++ b/libavformat/rtsp.c
@@ -1343,10 +1343,9 @@ static int rtsp_read_play(AVFormatContext *s)
     rtsp_send_cmd(s, cmd, reply, NULL);
     if (reply->status_code != RTSP_STATUS_OK) {
         return -1;
-    } else {
-        rt->state = RTSP_STATE_PLAYING;
-        return 0;
     }
+    rt->state = RTSP_STATE_PLAYING;
+    return 0;
 }
 
 /* pause the stream */
@@ -1367,10 +1366,9 @@ static int rtsp_read_pause(AVFormatContext *s)
     rtsp_send_cmd(s, cmd, reply, NULL);
     if (reply->status_code != RTSP_STATUS_OK) {
         return -1;
-    } else {
-        rt->state = RTSP_STATE_PAUSED;
-        return 0;
     }
+    rt->state = RTSP_STATE_PAUSED;
+    return 0;
 }
 
 static int rtsp_read_seek(AVFormatContext *s, int stream_index,

-- 
Libav/FFmpeg packaging