diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-15 20:33:21 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-15 21:00:50 +0200 |
| commit | fb33bff990a8327f59d4c7c509bba1f62bbd6c5a (patch) | |
| tree | c6f3ad232bed67c703999d78b3fcff66daa8c91d /ffserver.c | |
| parent | 3bb22973518cbef28504e4d5b9fd74453cc3339c (diff) | |
| parent | f929ab0569ff31ed5a59b0b0adb7ce09df3fca39 (diff) | |
| download | ffmpeg-fb33bff990a8327f59d4c7c509bba1f62bbd6c5a.tar.gz | |
Merge commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39'
* commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39':
cosmetics: Write NULL pointer equality checks more compactly
Conflicts:
cmdutils.c
ffmpeg_opt.c
ffplay.c
libavcodec/dvbsub.c
libavcodec/dvdsubdec.c
libavcodec/dvdsubenc.c
libavcodec/dxa.c
libavcodec/libxvid_rc.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo_enc.c
libavcodec/rv10.c
libavcodec/tiffenc.c
libavcodec/utils.c
libavcodec/vc1dec.c
libavcodec/zmbv.c
libavdevice/v4l2.c
libavformat/matroskadec.c
libavformat/movenc.c
libavformat/sdp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffserver.c')
| -rw-r--r-- | ffserver.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ffserver.c b/ffserver.c index 956d9f5172..e2e0f68757 100644 --- a/ffserver.c +++ b/ffserver.c @@ -1600,7 +1600,7 @@ static int http_parse_request(HTTPContext *c) break; stream = stream->next; } - if (stream == NULL) { + if (!stream) { snprintf(msg, sizeof(msg), "File '%s' not found", url); http_log("File '%s' not found\n", url); goto send_error; @@ -2980,7 +2980,7 @@ static int prepare_sdp_description(FFStream *stream, uint8_t **pbuffer, *pbuffer = NULL; avc = avformat_alloc_context(); - if (avc == NULL || !rtp_format) { + if (!avc || !rtp_format) { return -1; } avc->oformat = rtp_format; |