diff options
| author | Petri Hintukainen <phintuka@gmail.com> | 2015-11-26 10:33:42 +0200 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2015-11-26 10:55:36 +0100 |
| commit | 7139489c452ef8af6a745ec4e62056ee4ea4d6a8 (patch) | |
| tree | ea07107189e8f0636c83eb1265793979be59f8f4 | |
| parent | b0e8651a2a84553d08fbb2f7cb9697bd64fb1b55 (diff) | |
| download | ffmpeg-7139489c452ef8af6a745ec4e62056ee4ea4d6a8.tar.gz | |
pgssubdec: fix API compability layer
Copy pointers to AVPicture after memory has been allocated.
Fixes NULL pointers in AVPicture after a17a7661906ba295d67afd80ac0770422e1b02b3.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| -rw-r--r-- | libavcodec/pgssubdec.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/libavcodec/pgssubdec.c b/libavcodec/pgssubdec.c index d58b491ca3..7bcb1ed792 100644 --- a/libavcodec/pgssubdec.c +++ b/libavcodec/pgssubdec.c @@ -543,16 +543,6 @@ static int display_end_segment(AVCodecContext *avctx, void *data, sub->rects[i]->linesize[0] = object->w; -#if FF_API_AVPICTURE -FF_DISABLE_DEPRECATION_WARNINGS - rect = sub->rects[i]; - for (j = 0; j < 4; j++) { - rect->pict.data[j] = rect->data[j]; - rect->pict.linesize[j] = rect->linesize[j]; - } -FF_ENABLE_DEPRECATION_WARNINGS -#endif - if (object->rle) { if (object->rle_remaining_len) { av_log(avctx, AV_LOG_ERROR, "RLE data length %u is %u bytes shorter than expected\n", @@ -582,6 +572,16 @@ FF_ENABLE_DEPRECATION_WARNINGS return AVERROR(ENOMEM); } +#if FF_API_AVPICTURE +FF_DISABLE_DEPRECATION_WARNINGS + rect = sub->rects[i]; + for (j = 0; j < 4; j++) { + rect->pict.data[j] = rect->data[j]; + rect->pict.linesize[j] = rect->linesize[j]; + } +FF_ENABLE_DEPRECATION_WARNINGS +#endif + memcpy(sub->rects[i]->data[1], palette->clut, sub->rects[i]->nb_colors * sizeof(uint32_t)); } |