diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-10-16 03:29:55 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-10-16 03:29:55 +0100 |
| commit | 068bb5b95652c022419c64f3d29cc42c4610ae93 (patch) | |
| tree | 373b5b9bd91a351ae9727e6d4f388eb7157fda7f /src/lib/ffmpeg_decoder.cc | |
| parent | 13511ed2fcc23f4d5f9c507c775c3c5cfd82d155 (diff) | |
| parent | 27e1f73c75e6c0f75d4863cfe2c8e50f811913d9 (diff) | |
Merge branch 'master' of /home/carl/git/dvdomatic
Diffstat (limited to 'src/lib/ffmpeg_decoder.cc')
| -rw-r--r-- | src/lib/ffmpeg_decoder.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc index e01405191..e85439f6e 100644 --- a/src/lib/ffmpeg_decoder.cc +++ b/src/lib/ffmpeg_decoder.cc @@ -248,7 +248,7 @@ FFmpegDecoder::do_pass () int got_subtitle; AVSubtitle sub; if (avcodec_decode_subtitle2 (_subtitle_codec_context, &sub, &got_subtitle, &_packet) && got_subtitle) { - process_subtitle (shared_ptr<Subtitle> (new Subtitle (sub))); + process_subtitle (shared_ptr<TimedSubtitle> (new TimedSubtitle (sub))); avsubtitle_free (&sub); } } |