har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rtmpproto: Restructure zlib code to avoid unreachable code warning

Browse Source 
libavformat\rtmpproto.c(1165) : warning C4702: unreachable code
This commit is contained in:
Diego Biurrun 2015-10-29 13:39:49 +01:00
parent baab87c4f3
commit f4ca8ea92a
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavformat/rtmpproto.c
View File

@ -1111,7 +1111,7 @@ static int rtmp_calc_swfhash(URLContext *s)
{ {
RTMPContext *rt = s->priv_data; RTMPContext *rt = s->priv_data;
uint8_t *in_data = NULL, *out_data = NULL, *swfdata; uint8_t *in_data = NULL, *out_data = NULL, *swfdata;
int64_t in_size, out_size; int64_t in_size;
URLContext *stream; URLContext *stream;
char swfhash[32]; char swfhash[32];
int swfsize; int swfsize;
@ -1143,6 +1143,8 @@ static int rtmp_calc_swfhash(URLContext *s)
} }
if (!memcmp(in_data, "CWS", 3)) { if (!memcmp(in_data, "CWS", 3)) {
#if CONFIG_ZLIB
int64_t out_size;
/* Decompress the SWF player file using Zlib. */ /* Decompress the SWF player file using Zlib. */
if (!(out_data = av_malloc(8))) { if (!(out_data = av_malloc(8))) {
ret = AVERROR(ENOMEM); ret = AVERROR(ENOMEM);
@ -1152,18 +1154,17 @@ static int rtmp_calc_swfhash(URLContext *s)
memcpy(out_data, in_data, 8); memcpy(out_data, in_data, 8);
out_size = 8; out_size = 8;
#if CONFIG_ZLIB
if ((ret = rtmp_uncompress_swfplayer(in_data + 8, in_size - 8, if ((ret = rtmp_uncompress_swfplayer(in_data + 8, in_size - 8,
&out_data, &out_size)) < 0) &out_data, &out_size)) < 0)
goto fail; goto fail;
swfsize = out_size;
swfdata = out_data;
#else #else
av_log(s, AV_LOG_ERROR, av_log(s, AV_LOG_ERROR,
"Zlib is required for decompressing the SWF player file.\n"); "Zlib is required for decompressing the SWF player file.\n");
ret = AVERROR(EINVAL); ret = AVERROR(EINVAL);
goto fail; goto fail;
#endif #endif
swfsize = out_size;
swfdata = out_data;
} else { } else {
swfsize = in_size; swfsize = in_size;
swfdata = in_data; swfdata = in_data;