Originally committed as revision 11067 to svn://svn.ffmpeg.org/ffmpeg/trunk
Michael Niedermayer authored on 2007/11/20 05:33:25... | ... |
@@ -285,7 +285,7 @@ static void delete_region_display_list(DVBSubContext *ctx, DVBSubRegion *region) |
285 | 285 |
if (obj_disp) { |
286 | 286 |
*obj_disp_ptr = obj_disp->object_list_next; |
287 | 287 |
|
288 |
- if (object->display_list == NULL) { |
|
288 |
+ if (!object->display_list) { |
|
289 | 289 |
obj2 = ctx->object_list; |
290 | 290 |
obj2_ptr = &ctx->object_list; |
291 | 291 |
|
... | ... |
@@ -924,7 +924,7 @@ static void dvbsub_parse_clut_segment(AVCodecContext *avctx, |
924 | 924 |
|
925 | 925 |
clut = get_clut(ctx, clut_id); |
926 | 926 |
|
927 |
- if (clut == NULL) { |
|
927 |
+ if (!clut) { |
|
928 | 928 |
clut = av_malloc(sizeof(DVBSubCLUT)); |
929 | 929 |
|
930 | 930 |
memcpy(clut, &default_clut, sizeof(DVBSubCLUT)); |
... | ... |
@@ -1000,7 +1000,7 @@ static void dvbsub_parse_region_segment(AVCodecContext *avctx, |
1000 | 1000 |
|
1001 | 1001 |
region = get_region(ctx, region_id); |
1002 | 1002 |
|
1003 |
- if (region == NULL) { |
|
1003 |
+ if (!region) { |
|
1004 | 1004 |
region = av_mallocz(sizeof(DVBSubRegion)); |
1005 | 1005 |
|
1006 | 1006 |
region->id = region_id; |
... | ... |
@@ -1064,7 +1064,7 @@ static void dvbsub_parse_region_segment(AVCodecContext *avctx, |
1064 | 1064 |
|
1065 | 1065 |
object = get_object(ctx, object_id); |
1066 | 1066 |
|
1067 |
- if (object == NULL) { |
|
1067 |
+ if (!object) { |
|
1068 | 1068 |
object = av_mallocz(sizeof(DVBSubObject)); |
1069 | 1069 |
|
1070 | 1070 |
object->id = object_id; |
... | ... |
@@ -1138,7 +1138,7 @@ static void dvbsub_parse_page_segment(AVCodecContext *avctx, |
1138 | 1138 |
display = display->next; |
1139 | 1139 |
} |
1140 | 1140 |
|
1141 |
- if (display == NULL) |
|
1141 |
+ if (!display) |
|
1142 | 1142 |
display = av_mallocz(sizeof(DVBSubRegionDisplay)); |
1143 | 1143 |
|
1144 | 1144 |
display->region_id = region_id; |
... | ... |
@@ -1293,7 +1293,7 @@ static int dvbsub_display_end_segment(AVCodecContext *avctx, uint8_t *buf, |
1293 | 1293 |
region = get_region(ctx, display->region_id); |
1294 | 1294 |
rect = &sub->rects[i]; |
1295 | 1295 |
|
1296 |
- if (region == NULL) |
|
1296 |
+ if (!region) |
|
1297 | 1297 |
continue; |
1298 | 1298 |
|
1299 | 1299 |
rect->x = display->x_pos; |
... | ... |
@@ -1305,7 +1305,7 @@ static int dvbsub_display_end_segment(AVCodecContext *avctx, uint8_t *buf, |
1305 | 1305 |
|
1306 | 1306 |
clut = get_clut(ctx, region->clut); |
1307 | 1307 |
|
1308 |
- if (clut == NULL) |
|
1308 |
+ if (!clut) |
|
1309 | 1309 |
clut = &default_clut; |
1310 | 1310 |
|
1311 | 1311 |
switch (region->depth) { |