summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-02-25 11:32:00 +0000
committerCarl Hetherington <cth@carlh.net>2014-02-25 11:32:00 +0000
commit94668f0c97e3fff02e8c1225cfe27470b35e79e6 (patch)
tree5b038c35a0d19cf3a36780143c4b985aee8bcbd8 /src
parent0412f1a2b29f380cb4ca35787fc7174d6948072c (diff)
Fix seek to zero.
Diffstat (limited to 'src')
-rw-r--r--src/lib/ffmpeg_decoder.cc3
-rw-r--r--src/lib/player.cc12
2 files changed, 15 insertions, 0 deletions
diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index 4534de589..22e1b3bc1 100644
--- a/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@ -374,6 +374,9 @@ FFmpegDecoder::seek_and_flush (ContentTime t)
/* Ridiculous empirical hack */
s--;
+ if (s < 0) {
+ s = 0;
+ }
av_seek_frame (_format_context, _video_stream, s, AVSEEK_FLAG_BACKWARD);
diff --git a/src/lib/player.cc b/src/lib/player.cc
index a8ba7cc53..3584e75ca 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -173,6 +173,18 @@ Player::pass ()
shared_ptr<DecodedImageSubtitle> dis = dynamic_pointer_cast<DecodedImageSubtitle> (earliest_decoded);
shared_ptr<DecodedTextSubtitle> dts = dynamic_pointer_cast<DecodedTextSubtitle> (earliest_decoded);
+#if 0
+ if (dv) {
+ cout << "Video @ " << dv->dcp_time << " " << (double(dv->dcp_time) / TIME_HZ) << ".\n";
+ } else if (da) {
+ cout << "Audio.\n";
+ } else if (dis) {
+ cout << "Image sub.\n";
+ } else if (dts) {
+ cout << "Text sub.\n";
+ }
+#endif
+
/* Will be set to false if we shouldn't consume the peeked DecodedThing */
bool consume = true;