diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-05 11:24:10 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-05 11:25:40 +0200 |
| commit | fbd71bba8583eca54b481737ff04a4ff7e0a9fc2 (patch) | |
| tree | 82ae77d47c68ed5a9dfac7ee03fe16d970f7bcff | |
| parent | d0186a4ec4c4391906bf7dcd83d3ea3e3b858d82 (diff) | |
| parent | 1da2a20763ae9ca579d5fd20763065871ddf6311 (diff) | |
| download | ffmpeg-streaming-fbd71bba8583eca54b481737ff04a4ff7e0a9fc2.zip ffmpeg-streaming-fbd71bba8583eca54b481737ff04a4ff7e0a9fc2.tar.gz | |
Merge commit '1da2a20763ae9ca579d5fd20763065871ddf6311'
* commit '1da2a20763ae9ca579d5fd20763065871ddf6311':
dvbsubdec: Fix function return type
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| -rw-r--r-- | libavcodec/dvbsubdec.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libavcodec/dvbsubdec.c b/libavcodec/dvbsubdec.c index ab6054e..f0669da 100644 --- a/libavcodec/dvbsubdec.c +++ b/libavcodec/dvbsubdec.c @@ -1435,7 +1435,7 @@ static int dvbsub_parse_page_segment(AVCodecContext *avctx, #ifdef DEBUG -static void save_display_set(DVBSubContext *ctx) +static int save_display_set(DVBSubContext *ctx) { DVBSubRegion *region; DVBSubRegionDisplay *display; @@ -1456,7 +1456,7 @@ static void save_display_set(DVBSubContext *ctx) region = get_region(ctx, display->region_id); if (!region) - return; + return -1; if (x_pos == -1) { x_pos = display->x_pos; @@ -1488,13 +1488,13 @@ static void save_display_set(DVBSubContext *ctx) pbuf = av_malloc(width * height * 4); if (!pbuf) - return; + return -1; for (display = ctx->display_list; display; display = display->next) { region = get_region(ctx, display->region_id); if (!region) - return; + return -1; x_off = display->x_pos - x_pos; y_off = display->y_pos - y_pos; @@ -1534,6 +1534,7 @@ static void save_display_set(DVBSubContext *ctx) } fileno_index++; + return 0; } #endif |
