[vlc-commits] avcodec: subtitle: Don't use deprecated AVSubtitleRect::pict

Hugo Beauzée-Luyssen git at videolan.org
Wed Aug 23 17:39:49 CEST 2017


vlc | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Wed Aug 23 17:36:01 2017 +0200| [05653f3d753e640ea3d0952572cc6c060aec5a7d] | committer: Hugo Beauzée-Luyssen

avcodec: subtitle: Don't use deprecated AVSubtitleRect::pict

ref #18697

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=05653f3d753e640ea3d0952572cc6c060aec5a7d
---

 modules/codec/avcodec/subtitle.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/codec/avcodec/subtitle.c b/modules/codec/avcodec/subtitle.c
index 6b9b67445c..5cac6339d6 100644
--- a/modules/codec/avcodec/subtitle.c
+++ b/modules/codec/avcodec/subtitle.c
@@ -261,11 +261,11 @@ static subpicture_region_t *ConvertRegionRGBA(AVSubtitleRect *ffregion)
     for (int y = 0; y < ffregion->h; y++) {
         for (int x = 0; x < ffregion->w; x++) {
             /* I don't think don't have paletized RGB_A_ */
-            const uint8_t index = ffregion->pict.data[0][y * ffregion->w+x];
+            const uint8_t index = ffregion->data[0][y * ffregion->w+x];
             assert(index < ffregion->nb_colors);
 
             uint32_t color;
-            memcpy(&color, &ffregion->pict.data[1][4*index], 4);
+            memcpy(&color, &ffregion->data[1][4*index], 4);
 
             uint8_t *p_rgba = &p->p_pixels[y * p->i_pitch + x * p->i_pixel_pitch];
             p_rgba[0] = (color >> 16) & 0xff;



More information about the vlc-commits mailing list