From 5e9f14e4bf3a30934892a1801f24e838495762de Mon Sep 17 00:00:00 2001 From: Marton Balint Date: Fri, 23 Oct 2015 20:40:23 +0200 Subject: [PATCH] libzvbi-teletextdec: fix AVSubtitleRect pict compatiblity code Only set pict if we got a valid rect. Signed-off-by: Marton Balint --- libavcodec/libzvbi-teletextdec.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/libavcodec/libzvbi-teletextdec.c b/libavcodec/libzvbi-teletextdec.c index c63b1ec4ac..22acd3980e 100644 --- a/libavcodec/libzvbi-teletextdec.c +++ b/libavcodec/libzvbi-teletextdec.c @@ -464,18 +464,17 @@ static int teletext_decode_frame(AVCodecContext *avctx, void *data, int *data_si if (sub->rects) { sub->num_rects = 1; sub->rects[0] = ctx->pages->sub_rect; +#if FF_API_AVPICTURE +FF_DISABLE_DEPRECATION_WARNINGS + for (j = 0; j < 4; j++) { + sub->rects[0]->pict.data[j] = sub->rects[0]->data[j]; + sub->rects[0]->pict.linesize[j] = sub->rects[0]->linesize[j]; + } +FF_ENABLE_DEPRECATION_WARNINGS +#endif } else { ret = AVERROR(ENOMEM); } - -#if FF_API_AVPICTURE -FF_DISABLE_DEPRECATION_WARNINGS - for (j = 0; j < 4; j++) { - sub->rects[0]->pict.data[j] = sub->rects[0]->data[j]; - sub->rects[0]->pict.linesize[j] = sub->rects[0]->linesize[j]; - } -FF_ENABLE_DEPRECATION_WARNINGS -#endif } else { av_log(avctx, AV_LOG_DEBUG, "sending empty sub\n"); sub->rects = NULL;