* commit '1da2a20763ae9ca579d5fd20763065871ddf6311':
dvbsubdec: Fix function return type
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
... | ... |
@@ -1435,7 +1435,7 @@ static int dvbsub_parse_page_segment(AVCodecContext *avctx, |
1435 | 1435 |
|
1436 | 1436 |
|
1437 | 1437 |
#ifdef DEBUG |
1438 |
-static void save_display_set(DVBSubContext *ctx) |
|
1438 |
+static int save_display_set(DVBSubContext *ctx) |
|
1439 | 1439 |
{ |
1440 | 1440 |
DVBSubRegion *region; |
1441 | 1441 |
DVBSubRegionDisplay *display; |
... | ... |
@@ -1456,7 +1456,7 @@ static void save_display_set(DVBSubContext *ctx) |
1456 | 1456 |
region = get_region(ctx, display->region_id); |
1457 | 1457 |
|
1458 | 1458 |
if (!region) |
1459 |
- return; |
|
1459 |
+ return -1; |
|
1460 | 1460 |
|
1461 | 1461 |
if (x_pos == -1) { |
1462 | 1462 |
x_pos = display->x_pos; |
... | ... |
@@ -1488,13 +1488,13 @@ static void save_display_set(DVBSubContext *ctx) |
1488 | 1488 |
|
1489 | 1489 |
pbuf = av_malloc(width * height * 4); |
1490 | 1490 |
if (!pbuf) |
1491 |
- return; |
|
1491 |
+ return -1; |
|
1492 | 1492 |
|
1493 | 1493 |
for (display = ctx->display_list; display; display = display->next) { |
1494 | 1494 |
region = get_region(ctx, display->region_id); |
1495 | 1495 |
|
1496 | 1496 |
if (!region) |
1497 |
- return; |
|
1497 |
+ return -1; |
|
1498 | 1498 |
|
1499 | 1499 |
x_off = display->x_pos - x_pos; |
1500 | 1500 |
y_off = display->y_pos - y_pos; |
... | ... |
@@ -1534,6 +1534,7 @@ static void save_display_set(DVBSubContext *ctx) |
1534 | 1534 |
} |
1535 | 1535 |
|
1536 | 1536 |
fileno_index++; |
1537 |
+ return 0; |
|
1537 | 1538 |
} |
1538 | 1539 |
#endif |
1539 | 1540 |
|