summaryrefslogtreecommitdiff
path: root/src/lib/decoder.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2012-10-10 15:47:06 +0100
committerCarl Hetherington <cth@carlh.net>2012-10-10 15:47:06 +0100
commitcc4a67b7eb8ecaed076e261960848f70e3e741af (patch)
treea41a122341543aee630d6842785d90830298a297 /src/lib/decoder.cc
parentd382f34db155ddaf4bb61538c18b87c7564e00b2 (diff)
Subs successfully exported with thumbs.
Diffstat (limited to 'src/lib/decoder.cc')
-rw-r--r--src/lib/decoder.cc6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/lib/decoder.cc b/src/lib/decoder.cc
index 15d74022c..e4b892ea4 100644
--- a/src/lib/decoder.cc
+++ b/src/lib/decoder.cc
@@ -228,7 +228,7 @@ Decoder::process_audio (uint8_t* data, int size)
* @param frame to decode; caller manages memory.
*/
void
-Decoder::process_video (AVFrame* frame)
+Decoder::process_video (AVFrame* frame, shared_ptr<Subtitle> sub)
{
if (_minimal) {
++_video_frame;
@@ -303,10 +303,8 @@ Decoder::process_video (AVFrame* frame)
image->make_black ();
}
- overlay (image);
-
TIMING ("Decoder emits %1", _video_frame);
- Video (image, _video_frame);
+ Video (image, _video_frame, sub);
++_video_frame;
}
}