diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-03-08 10:36:44 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-03-08 10:36:44 +0000 |
| commit | 0f3c2864599f9e5a5ec001266b4aefb0205d1e1f (patch) | |
| tree | 2158a8f135e4a196b784df285db008e5ec2439e5 /src/lib/ffmpeg.cc | |
| parent | bdae32bb84672026c1a373e809804109e95accf4 (diff) | |
| parent | a2668dcfc484e5e2b158bd3b51b835a96660c8d8 (diff) | |
Fix merge.
Diffstat (limited to 'src/lib/ffmpeg.cc')
| -rw-r--r-- | src/lib/ffmpeg.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/ffmpeg.cc b/src/lib/ffmpeg.cc index 9d6921dcf..296002c74 100644 --- a/src/lib/ffmpeg.cc +++ b/src/lib/ffmpeg.cc @@ -280,9 +280,9 @@ FFmpeg::subtitle_id (AVSubtitle const & sub) digester.add (rect->y); digester.add (rect->w); digester.add (rect->h); - int const line = rect->pict.linesize[0]; + int const line = rect->linesize[0]; for (int j = 0; j < rect->h; ++j) { - digester.add (rect->pict.data[0] + j * line, line); + digester.add (rect->data[0] + j * line, line); } } return digester.get (); |