ffmpeg | branch: master | Marton Balint <c...@passwd.hu> | Fri Oct 23 20:40:23 2015 +0200| [5e9f14e4bf3a30934892a1801f24e838495762de] | committer: Marton Balint
libzvbi-teletextdec: fix AVSubtitleRect pict compatiblity code Only set pict if we got a valid rect. Signed-off-by: Marton Balint <c...@passwd.hu> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5e9f14e4bf3a30934892a1801f24e838495762de --- libavcodec/libzvbi-teletextdec.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/libavcodec/libzvbi-teletextdec.c b/libavcodec/libzvbi-teletextdec.c index c63b1ec..22acd39 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; - } 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]; - } + 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); + } } else { av_log(avctx, AV_LOG_DEBUG, "sending empty sub\n"); sub->rects = NULL; _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
