[FFmpeg-cvslog] ffmpeg: do not use deprecated AVSubtitleRect.pict

Clément Bœsch git at videolan.org
Sat Jun 25 13:35:51 CEST 2016


ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Sat Jun 25 13:35:46 2016 +0200| [11ee8a4504992965fb0db9cb0f513e93601d68bf] | committer: Clément Bœsch

ffmpeg: do not use deprecated AVSubtitleRect.pict

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=11ee8a4504992965fb0db9cb0f513e93601d68bf
---

 ffmpeg.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ffmpeg.c b/ffmpeg.c
index 4564a62..9ffd833 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -197,15 +197,15 @@ static void sub2video_copy_rect(uint8_t *dst, int dst_linesize, int w, int h,
     }
 
     dst += r->y * dst_linesize + r->x * 4;
-    src = r->pict.data[0];
-    pal = (uint32_t *)r->pict.data[1];
+    src = r->data[0];
+    pal = (uint32_t *)r->data[1];
     for (y = 0; y < r->h; y++) {
         dst2 = (uint32_t *)dst;
         src2 = src;
         for (x = 0; x < r->w; x++)
             *(dst2++) = pal[*(src2++)];
         dst += dst_linesize;
-        src += r->pict.linesize[0];
+        src += r->linesize[0];
     }
 }
 



More information about the ffmpeg-cvslog mailing list