Commit 60dbed60 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '4b1f5e50'

* commit '4b1f5e50':
  cosmetics: Write NULL pointer inequality checks more compactly

Conflicts:
	libavcodec/dvdsubdec.c
	libavcodec/h263dec.c
	libavcodec/libxvid.c
	libavcodec/rv10.c
	libavcodec/utils.c
	libavformat/format.c
	libavformat/matroskadec.c
	libavformat/segment.c
	libavutil/opt.c
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents fb33bff9 4b1f5e50
...@@ -205,7 +205,7 @@ static const OptionDef *find_option(const OptionDef *po, const char *name) ...@@ -205,7 +205,7 @@ static const OptionDef *find_option(const OptionDef *po, const char *name)
const char *p = strchr(name, ':'); const char *p = strchr(name, ':');
int len = p ? p - name : strlen(name); int len = p ? p - name : strlen(name);
while (po->name != NULL) { while (po->name) {
if (!strncmp(name, po->name, len) && strlen(po->name) == len) if (!strncmp(name, po->name, len) && strlen(po->name) == len)
break; break;
po++; po++;
......
...@@ -658,7 +658,7 @@ frame_end: ...@@ -658,7 +658,7 @@ frame_end:
return ret; return ret;
ff_print_debug_info(s, s->current_picture_ptr, pict); ff_print_debug_info(s, s->current_picture_ptr, pict);
ff_mpv_export_qp_table(s, pict, s->current_picture_ptr, FF_QSCALE_TYPE_MPEG1); ff_mpv_export_qp_table(s, pict, s->current_picture_ptr, FF_QSCALE_TYPE_MPEG1);
} else if (s->last_picture_ptr != NULL) { } else if (s->last_picture_ptr) {
if ((ret = av_frame_ref(pict, s->last_picture_ptr->f)) < 0) if ((ret = av_frame_ref(pict, s->last_picture_ptr->f)) < 0)
return ret; return ret;
ff_print_debug_info(s, s->last_picture_ptr, pict); ff_print_debug_info(s, s->last_picture_ptr, pict);
......
...@@ -811,7 +811,7 @@ int ff_h264_decode_ref_pic_marking(H264Context *h, GetBitContext *gb, ...@@ -811,7 +811,7 @@ int ff_h264_decode_ref_pic_marking(H264Context *h, GetBitContext *gb,
(h->max_pic_num - 1); (h->max_pic_num - 1);
#if 0 #if 0
if (mmco[i].short_pic_num >= h->short_ref_count || if (mmco[i].short_pic_num >= h->short_ref_count ||
!h->short_ref[ mmco[i].short_pic_num ]) { !h->short_ref[mmco[i].short_pic_num]) {
av_log(s->avctx, AV_LOG_ERROR, av_log(s->avctx, AV_LOG_ERROR,
"illegal short ref in memory management control " "illegal short ref in memory management control "
"operation %d\n", mmco); "operation %d\n", mmco);
......
...@@ -196,7 +196,7 @@ static void coded_frame_add(void *list, struct FrameListData *cx_frame) ...@@ -196,7 +196,7 @@ static void coded_frame_add(void *list, struct FrameListData *cx_frame)
{ {
struct FrameListData **p = list; struct FrameListData **p = list;
while (*p != NULL) while (*p)
p = &(*p)->next; p = &(*p)->next;
*p = cx_frame; *p = cx_frame;
cx_frame->next = NULL; cx_frame->next = NULL;
......
...@@ -139,7 +139,7 @@ static int xvid_ff_2pass_destroy(struct xvid_context *ref, ...@@ -139,7 +139,7 @@ static int xvid_ff_2pass_destroy(struct xvid_context *ref,
xvid_plg_destroy_t *param) { xvid_plg_destroy_t *param) {
/* Currently cannot think of anything to do on destruction */ /* Currently cannot think of anything to do on destruction */
/* Still, the framework should be here for reference/use */ /* Still, the framework should be here for reference/use */
if( ref->twopassbuffer != NULL ) if (ref->twopassbuffer)
ref->twopassbuffer[0] = 0; ref->twopassbuffer[0] = 0;
return 0; return 0;
} }
...@@ -789,7 +789,7 @@ static av_cold int xvid_encode_close(AVCodecContext *avctx) { ...@@ -789,7 +789,7 @@ static av_cold int xvid_encode_close(AVCodecContext *avctx) {
x->encoder_handle = NULL; x->encoder_handle = NULL;
av_freep(&avctx->extradata); av_freep(&avctx->extradata);
if( x->twopassbuffer != NULL ) { if (x->twopassbuffer) {
av_freep(&x->twopassbuffer); av_freep(&x->twopassbuffer);
av_freep(&x->old_twopassbuffer); av_freep(&x->old_twopassbuffer);
avctx->stats_out = NULL; avctx->stats_out = NULL;
......
...@@ -2067,7 +2067,7 @@ static int slice_end(AVCodecContext *avctx, AVFrame *pict) ...@@ -2067,7 +2067,7 @@ static int slice_end(AVCodecContext *avctx, AVFrame *pict)
s->picture_number++; s->picture_number++;
/* latency of 1 frame for I- and P-frames */ /* latency of 1 frame for I- and P-frames */
/* XXX: use another variable than picture_number */ /* XXX: use another variable than picture_number */
if (s->last_picture_ptr != NULL) { if (s->last_picture_ptr) {
int ret = av_frame_ref(pict, s->last_picture_ptr->f); int ret = av_frame_ref(pict, s->last_picture_ptr->f);
if (ret < 0) if (ret < 0)
return ret; return ret;
......
...@@ -462,7 +462,7 @@ static void qdm2_decode_sub_packet_header(GetBitContext *gb, ...@@ -462,7 +462,7 @@ static void qdm2_decode_sub_packet_header(GetBitContext *gb,
static QDM2SubPNode *qdm2_search_subpacket_type_in_list(QDM2SubPNode *list, static QDM2SubPNode *qdm2_search_subpacket_type_in_list(QDM2SubPNode *list,
int type) int type)
{ {
while (list != NULL && list->packet != NULL) { while (list && list->packet) {
if (list->packet->type == type) if (list->packet->type == type)
return list; return list;
list = list->next; list = list->next;
...@@ -1248,23 +1248,23 @@ static void process_synthesis_subpackets(QDM2Context *q, QDM2SubPNode *list) ...@@ -1248,23 +1248,23 @@ static void process_synthesis_subpackets(QDM2Context *q, QDM2SubPNode *list)
QDM2SubPNode *nodes[4]; QDM2SubPNode *nodes[4];
nodes[0] = qdm2_search_subpacket_type_in_list(list, 9); nodes[0] = qdm2_search_subpacket_type_in_list(list, 9);
if (nodes[0] != NULL) if (nodes[0])
process_subpacket_9(q, nodes[0]); process_subpacket_9(q, nodes[0]);
nodes[1] = qdm2_search_subpacket_type_in_list(list, 10); nodes[1] = qdm2_search_subpacket_type_in_list(list, 10);
if (nodes[1] != NULL) if (nodes[1])
process_subpacket_10(q, nodes[1]); process_subpacket_10(q, nodes[1]);
else else
process_subpacket_10(q, NULL); process_subpacket_10(q, NULL);
nodes[2] = qdm2_search_subpacket_type_in_list(list, 11); nodes[2] = qdm2_search_subpacket_type_in_list(list, 11);
if (nodes[0] != NULL && nodes[1] != NULL && nodes[2] != NULL) if (nodes[0] && nodes[1] && nodes[2])
process_subpacket_11(q, nodes[2]); process_subpacket_11(q, nodes[2]);
else else
process_subpacket_11(q, NULL); process_subpacket_11(q, NULL);
nodes[3] = qdm2_search_subpacket_type_in_list(list, 12); nodes[3] = qdm2_search_subpacket_type_in_list(list, 12);
if (nodes[0] != NULL && nodes[1] != NULL && nodes[3] != NULL) if (nodes[0] && nodes[1] && nodes[3])
process_subpacket_12(q, nodes[3]); process_subpacket_12(q, nodes[3]);
else else
process_subpacket_12(q, NULL); process_subpacket_12(q, NULL);
...@@ -1389,7 +1389,7 @@ static void qdm2_decode_super_block(QDM2Context *q) ...@@ -1389,7 +1389,7 @@ static void qdm2_decode_super_block(QDM2Context *q)
} }
} // Packet bytes loop } // Packet bytes loop
if (q->sub_packet_list_D[0].packet != NULL) { if (q->sub_packet_list_D[0].packet) {
process_synthesis_subpackets(q, q->sub_packet_list_D); process_synthesis_subpackets(q, q->sub_packet_list_D);
q->do_synth_filter = 1; q->do_synth_filter = 1;
} else if (q->do_synth_filter) { } else if (q->do_synth_filter) {
...@@ -1987,7 +1987,7 @@ static int qdm2_decode(QDM2Context *q, const uint8_t *in, int16_t *out) ...@@ -1987,7 +1987,7 @@ static int qdm2_decode(QDM2Context *q, const uint8_t *in, int16_t *out)
for (ch = 0; ch < q->channels; ch++) { for (ch = 0; ch < q->channels; ch++) {
qdm2_calculate_fft(q, ch, q->sub_packet); qdm2_calculate_fft(q, ch, q->sub_packet);
if (!q->has_errors && q->sub_packet_list_C[0].packet != NULL) { if (!q->has_errors && q->sub_packet_list_C[0].packet) {
SAMPLES_NEEDED_2("has errors, and C list is not empty") SAMPLES_NEEDED_2("has errors, and C list is not empty")
return -1; return -1;
} }
......
...@@ -760,7 +760,7 @@ static int rv10_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, ...@@ -760,7 +760,7 @@ static int rv10_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
i++; i++;
} }
if (s->current_picture_ptr != NULL && s->mb_y >= s->mb_height) { if (s->current_picture_ptr && s->mb_y >= s->mb_height) {
ff_er_frame_end(&s->er); ff_er_frame_end(&s->er);
ff_mpv_frame_end(s); ff_mpv_frame_end(s);
...@@ -769,7 +769,7 @@ static int rv10_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, ...@@ -769,7 +769,7 @@ static int rv10_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
return ret; return ret;
ff_print_debug_info(s, s->current_picture_ptr, pict); ff_print_debug_info(s, s->current_picture_ptr, pict);
ff_mpv_export_qp_table(s, pict, s->current_picture_ptr, FF_QSCALE_TYPE_MPEG1); ff_mpv_export_qp_table(s, pict, s->current_picture_ptr, FF_QSCALE_TYPE_MPEG1);
} else if (s->last_picture_ptr != NULL) { } else if (s->last_picture_ptr) {
if ((ret = av_frame_ref(pict, s->last_picture_ptr->f)) < 0) if ((ret = av_frame_ref(pict, s->last_picture_ptr->f)) < 0)
return ret; return ret;
ff_print_debug_info(s, s->last_picture_ptr, pict); ff_print_debug_info(s, s->last_picture_ptr, pict);
......
...@@ -1606,7 +1606,7 @@ static int finish_frame(AVCodecContext *avctx, AVFrame *pict) ...@@ -1606,7 +1606,7 @@ static int finish_frame(AVCodecContext *avctx, AVFrame *pict)
ff_print_debug_info(s, s->current_picture_ptr, pict); ff_print_debug_info(s, s->current_picture_ptr, pict);
ff_mpv_export_qp_table(s, pict, s->current_picture_ptr, FF_QSCALE_TYPE_MPEG1); ff_mpv_export_qp_table(s, pict, s->current_picture_ptr, FF_QSCALE_TYPE_MPEG1);
got_picture = 1; got_picture = 1;
} else if (s->last_picture_ptr != NULL) { } else if (s->last_picture_ptr) {
if ((ret = av_frame_ref(pict, s->last_picture_ptr->f)) < 0) if ((ret = av_frame_ref(pict, s->last_picture_ptr->f)) < 0)
return ret; return ret;
ff_print_debug_info(s, s->last_picture_ptr, pict); ff_print_debug_info(s, s->last_picture_ptr, pict);
......
...@@ -643,7 +643,7 @@ static int video_get_buffer(AVCodecContext *s, AVFrame *pic) ...@@ -643,7 +643,7 @@ static int video_get_buffer(AVCodecContext *s, AVFrame *pic)
FramePool *pool = s->internal->pool; FramePool *pool = s->internal->pool;
int i; int i;
if (pic->data[0] != NULL) { if (pic->data[0]) {
av_log(s, AV_LOG_ERROR, "pic->data[0]!=NULL in avcodec_default_get_buffer\n"); av_log(s, AV_LOG_ERROR, "pic->data[0]!=NULL in avcodec_default_get_buffer\n");
return -1; return -1;
} }
......
...@@ -6229,7 +6229,7 @@ image: ...@@ -6229,7 +6229,7 @@ image:
goto err; goto err;
ff_print_debug_info(s, s->current_picture_ptr, pict); ff_print_debug_info(s, s->current_picture_ptr, pict);
*got_frame = 1; *got_frame = 1;
} else if (s->last_picture_ptr != NULL) { } else if (s->last_picture_ptr) {
if ((ret = av_frame_ref(pict, s->last_picture_ptr->f)) < 0) if ((ret = av_frame_ref(pict, s->last_picture_ptr->f)) < 0)
goto err; goto err;
ff_print_debug_info(s, s->last_picture_ptr, pict); ff_print_debug_info(s, s->last_picture_ptr, pict);
......
...@@ -98,7 +98,7 @@ int ffurl_register_protocol(URLProtocol *protocol) ...@@ -98,7 +98,7 @@ int ffurl_register_protocol(URLProtocol *protocol)
{ {
URLProtocol **p; URLProtocol **p;
p = &first_protocol; p = &first_protocol;
while (*p != NULL) while (*p)
p = &(*p)->next; p = &(*p)->next;
*p = protocol; *p = protocol;
protocol->next = NULL; protocol->next = NULL;
......
...@@ -157,7 +157,7 @@ static int http_open_cnx_internal(URLContext *h, AVDictionary **options) ...@@ -157,7 +157,7 @@ static int http_open_cnx_internal(URLContext *h, AVDictionary **options)
proxy_path = getenv("http_proxy"); proxy_path = getenv("http_proxy");
use_proxy = !ff_http_match_no_proxy(getenv("no_proxy"), hostname) && use_proxy = !ff_http_match_no_proxy(getenv("no_proxy"), hostname) &&
proxy_path != NULL && av_strstart(proxy_path, "http://", NULL); proxy_path && av_strstart(proxy_path, "http://", NULL);
if (!strcmp(proto, "https")) { if (!strcmp(proto, "https")) {
lower_proto = "tls"; lower_proto = "tls";
......
...@@ -1748,7 +1748,7 @@ static int matroska_parse_tracks(AVFormatContext *s) ...@@ -1748,7 +1748,7 @@ static int matroska_parse_tracks(AVFormatContext *s)
if (!strcmp(track->codec_id, "V_MS/VFW/FOURCC") && if (!strcmp(track->codec_id, "V_MS/VFW/FOURCC") &&
track->codec_priv.size >= 40 && track->codec_priv.size >= 40 &&
track->codec_priv.data != NULL) { track->codec_priv.data) {
track->ms_compat = 1; track->ms_compat = 1;
bit_depth = AV_RL16(track->codec_priv.data + 14); bit_depth = AV_RL16(track->codec_priv.data + 14);
fourcc = AV_RL32(track->codec_priv.data + 16); fourcc = AV_RL32(track->codec_priv.data + 16);
...@@ -1760,7 +1760,7 @@ static int matroska_parse_tracks(AVFormatContext *s) ...@@ -1760,7 +1760,7 @@ static int matroska_parse_tracks(AVFormatContext *s)
extradata_offset = 40; extradata_offset = 40;
} else if (!strcmp(track->codec_id, "A_MS/ACM") && } else if (!strcmp(track->codec_id, "A_MS/ACM") &&
track->codec_priv.size >= 14 && track->codec_priv.size >= 14 &&
track->codec_priv.data != NULL) { track->codec_priv.data) {
int ret; int ret;
ffio_init_context(&b, track->codec_priv.data, ffio_init_context(&b, track->codec_priv.data,
track->codec_priv.size, track->codec_priv.size,
...@@ -1781,7 +1781,7 @@ static int matroska_parse_tracks(AVFormatContext *s) ...@@ -1781,7 +1781,7 @@ static int matroska_parse_tracks(AVFormatContext *s)
} }
} else if (!strcmp(track->codec_id, "V_QUICKTIME") && } else if (!strcmp(track->codec_id, "V_QUICKTIME") &&
(track->codec_priv.size >= 21) && (track->codec_priv.size >= 21) &&
(track->codec_priv.data != NULL)) { (track->codec_priv.data)) {
fourcc = AV_RL32(track->codec_priv.data + 4); fourcc = AV_RL32(track->codec_priv.data + 4);
codec_id = ff_codec_get_id(ff_codec_movvideo_tags, fourcc); codec_id = ff_codec_get_id(ff_codec_movvideo_tags, fourcc);
if (ff_codec_get_id(ff_codec_movvideo_tags, AV_RL32(track->codec_priv.data))) { if (ff_codec_get_id(ff_codec_movvideo_tags, AV_RL32(track->codec_priv.data))) {
......
...@@ -4008,7 +4008,7 @@ static int mov_write_header(AVFormatContext *s) ...@@ -4008,7 +4008,7 @@ static int mov_write_header(AVFormatContext *s)
/* Default mode == MP4 */ /* Default mode == MP4 */
mov->mode = MODE_MP4; mov->mode = MODE_MP4;
if (s->oformat != NULL) { if (s->oformat) {
if (!strcmp("3gp", s->oformat->name)) mov->mode = MODE_3GP; if (!strcmp("3gp", s->oformat->name)) mov->mode = MODE_3GP;
else if (!strcmp("3g2", s->oformat->name)) mov->mode = MODE_3GP|MODE_3G2; else if (!strcmp("3g2", s->oformat->name)) mov->mode = MODE_3GP|MODE_3G2;
else if (!strcmp("mov", s->oformat->name)) mov->mode = MODE_MOV; else if (!strcmp("mov", s->oformat->name)) mov->mode = MODE_MOV;
......
...@@ -372,7 +372,7 @@ static int gen_connect(URLContext *s, RTMPContext *rt) ...@@ -372,7 +372,7 @@ static int gen_connect(URLContext *s, RTMPContext *rt)
char *param = rt->conn; char *param = rt->conn;
// Write arbitrary AMF data to the Connect message. // Write arbitrary AMF data to the Connect message.
while (param != NULL) { while (param) {
char *sep; char *sep;
param += strspn(param, " "); param += strspn(param, " ");
if (!*param) if (!*param)
......
...@@ -193,7 +193,7 @@ static int tls_open(URLContext *h, const char *uri, int flags) ...@@ -193,7 +193,7 @@ static int tls_open(URLContext *h, const char *uri, int flags)
proxy_path = getenv("http_proxy"); proxy_path = getenv("http_proxy");
use_proxy = !ff_http_match_no_proxy(getenv("no_proxy"), host) && use_proxy = !ff_http_match_no_proxy(getenv("no_proxy"), host) &&
proxy_path != NULL && av_strstart(proxy_path, "http://", NULL); proxy_path && av_strstart(proxy_path, "http://", NULL);
if (use_proxy) { if (use_proxy) {
char proxy_host[200], proxy_auth[200], dest[200]; char proxy_host[200], proxy_auth[200], dest[200];
......
...@@ -111,7 +111,7 @@ void ff_make_absolute_url(char *buf, int size, const char *base, ...@@ -111,7 +111,7 @@ void ff_make_absolute_url(char *buf, int size, const char *base,
/* Strip off any query string from base */ /* Strip off any query string from base */
path_query = strchr(buf, '?'); path_query = strchr(buf, '?');
if (path_query != NULL) if (path_query)
*path_query = '\0'; *path_query = '\0';
/* Is relative path just a new query part? */ /* Is relative path just a new query part? */
......
...@@ -1183,7 +1183,7 @@ void av_opt_set_defaults2(void *s, int mask, int flags) ...@@ -1183,7 +1183,7 @@ void av_opt_set_defaults2(void *s, int mask, int flags)
{ {
#endif #endif
const AVOption *opt = NULL; const AVOption *opt = NULL;
while ((opt = av_opt_next(s, opt)) != NULL) { while ((opt = av_opt_next(s, opt))) {
void *dst = ((uint8_t*)s) + opt->offset; void *dst = ((uint8_t*)s) + opt->offset;
#if FF_API_OLD_AVOPTIONS #if FF_API_OLD_AVOPTIONS
if ((opt->flags & mask) != flags) if ((opt->flags & mask) != flags)
......
...@@ -177,7 +177,7 @@ int main(int argc, char **argv) ...@@ -177,7 +177,7 @@ int main(int argc, char **argv)
return 1; return 1;
} }
if ((ext = strrchr(argv[1], '.')) != NULL && !strcmp(ext, ".wav")) if ((ext = strrchr(argv[1], '.')) && !strcmp(ext, ".wav"))
put_wav_header(sample_rate, nb_channels, 6 * sample_rate); put_wav_header(sample_rate, nb_channels, 6 * sample_rate);
/* 1 second of single freq sine at 1000 Hz */ /* 1 second of single freq sine at 1000 Hz */
......
...@@ -329,7 +329,7 @@ static int handle_file(struct Tracks *tracks, const char *file, int split, ...@@ -329,7 +329,7 @@ static int handle_file(struct Tracks *tracks, const char *file, int split,
tracks->tracks[tracks->nb_tracks] = track; tracks->tracks[tracks->nb_tracks] = track;
track->name = file; track->name = file;
if ((ptr = strrchr(file, '/')) != NULL) if ((ptr = strrchr(file, '/')))
track->name = ptr + 1; track->name = ptr + 1;
track->bitrate = st->codec->bit_rate; track->bitrate = st->codec->bit_rate;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment