summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2012-12-16 13:43:56 +0000
committerCarl Hetherington <cth@carlh.net>2012-12-16 13:43:56 +0000
commitbd75347a20c3952954121ce00ec2ac6fa62a01ac (patch)
tree0b54cb1ff5937e4f5a38f08ddf50f48a11d31175 /src/lib
parent3171c89fef95b19c8889996caaac73eea71cf388 (diff)
Small method rename.
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/ffmpeg_decoder.cc4
-rw-r--r--src/lib/ffmpeg_decoder.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index 51afc461a..9fd6a0c05 100644
--- a/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@ -273,7 +273,7 @@ FFmpegDecoder::pass ()
}
if (_opt->video_sync) {
- out_careful ();
+ out_with_sync ();
} else {
filter_and_emit_video (_frame);
}
@@ -620,7 +620,7 @@ FFmpegAudioStream::to_string () const
void
-FFmpegDecoder::out_careful ()
+FFmpegDecoder::out_with_sync ()
{
/* Where we are in the output, in seconds */
double const out_pts_seconds = video_frame() / frames_per_second();
diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h
index d5753393e..9cf3de28f 100644
--- a/src/lib/ffmpeg_decoder.h
+++ b/src/lib/ffmpeg_decoder.h
@@ -108,7 +108,7 @@ private:
AVSampleFormat audio_sample_format () const;
int bytes_per_audio_sample () const;
- void out_careful ();
+ void out_with_sync ();
void filter_and_emit_video (AVFrame *);
void setup_general ();