[FFmpeg-cvslog] avcodec/dvbsubdec: Add return code to save_subtitle_set()
Michael Niedermayer
git at videolan.org
Tue Nov 11 22:28:39 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Nov 11 22:15:14 2014 +0100| [6229f7823e2a9b93a95ce27c10efc156a555c20d] | committer: Michael Niedermayer
avcodec/dvbsubdec: Add return code to save_subtitle_set()
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6229f7823e2a9b93a95ce27c10efc156a555c20d
---
libavcodec/dvbsubdec.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/libavcodec/dvbsubdec.c b/libavcodec/dvbsubdec.c
index 40b156e..021f943 100644
--- a/libavcodec/dvbsubdec.c
+++ b/libavcodec/dvbsubdec.c
@@ -757,7 +757,7 @@ static int dvbsub_read_8bit_string(uint8_t *destbuf, int dbuf_len,
return pixels_read;
}
-static void save_subtitle_set(AVCodecContext *avctx, AVSubtitle *sub, int *got_output)
+static int save_subtitle_set(AVCodecContext *avctx, AVSubtitle *sub, int *got_output)
{
DVBSubContext *ctx = avctx->priv_data;
DVBSubRegionDisplay *display;
@@ -778,7 +778,7 @@ static void save_subtitle_set(AVCodecContext *avctx, AVSubtitle *sub, int *got_o
/* Not touching AVSubtitles again*/
if(sub->num_rects) {
avpriv_request_sample(ctx, "Different Version of Segment asked Twice\n");
- return;
+ return AVERROR_PATCHWELCOME;
}
for (display = ctx->display_list; display; display = display->next) {
region = get_region(ctx, display->region_id);
@@ -846,6 +846,8 @@ static void save_subtitle_set(AVCodecContext *avctx, AVSubtitle *sub, int *got_o
i++;
}
}
+
+ return 0;
}
static void dvbsub_parse_pixel_data_block(AVCodecContext *avctx, DVBSubObjectDisplay *display,
More information about the ffmpeg-cvslog
mailing list