Mirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2025-12-28 05:33:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

sd_lavc: take care of AVPicture deprecation

Browse Source
This commit is contained in:
wm4
2015-10-23 20:14:08 +02:00
parent 97fc4f4a85
commit 252dcdcc99
3 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
sub/sd_lavc.c
View File

@@ -23,6 +23,8 @@
#include <libavutil/common.h>
#include <libavutil/intreadwrite.h>
#include "config.h"
#include "talloc.h"
#include "common/msg.h"
#include "common/av_common.h"
@@ -210,12 +212,19 @@ static void decode(struct sd *sd, struct demux_packet *packet)
continue;
if (r->w <= 0 || r->h <= 0)
continue;
img->bitmap = r->pict.data[0];
#if HAVE_AV_SUBTITLE_NOPICT
uint8_t **data = r->data;
int *linesize = r->linesize;
#else
uint8_t **data = r->pict.data;
int *linesize = r->pict.linesize;
#endif
img->bitmap = data[0];
assert(r->nb_colors > 0);
assert(r->nb_colors * 4 <= sizeof(img->palette));
memcpy(img->palette, r->pict.data[1], r->nb_colors * 4);
memcpy(img->palette, data[1], r->nb_colors * 4);
b->bitmap = img;
b->stride = r->pict.linesize[0];
b->stride = linesize[0];
b->w = r->w;
b->h = r->h;
b->x = r->x;