aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorReynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>2015-03-08 14:15:50 -0300
committerReynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>2015-03-08 18:24:56 -0300
commit0002a22e0e4e4214a51f18d0e08517b75696c4c0 (patch)
treea3faee31104df85f9838fffa508ffd1a87ebd376
parent923a24456972567ff6f7f0534a25f33d056a6fbc (diff)
downloadffmpeg-0002a22e0e4e4214a51f18d0e08517b75696c4c0.tar.gz
ffserver: move assignment outside condition eval
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
-rw-r--r--ffserver.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/ffserver.c b/ffserver.c
index 29e7bd9728..e57c48892c 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -2837,9 +2837,12 @@ static int prepare_sdp_description(FFServerStream *stream, uint8_t **pbuffer,
snprintf(avc->filename, 1024, "rtp://0.0.0.0");
}
- if (!(avc->streams = av_malloc_array(avc->nb_streams, sizeof(*avc->streams))))
+ avc->streams = av_malloc_array(avc->nb_streams, sizeof(*avc->streams));
+ if (!avc->streams)
goto sdp_done;
- if (!(avs = av_malloc_array(avc->nb_streams, sizeof(*avs))))
+
+ avs = av_malloc_array(avc->nb_streams, sizeof(*avs));
+ if (!avs)
goto sdp_done;
for(i = 0; i < stream->nb_streams; i++) {