From 50cb31af16240b248700dab1484d7f07656c66df Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 20 Jun 2013 17:34:23 +0100 Subject: Various fixes to make audio analysis sort-of work. --- src/lib/ffmpeg_decoder.cc | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'src/lib/ffmpeg_decoder.cc') diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc index 36078a463..2e586b8f7 100644 --- a/src/lib/ffmpeg_decoder.cc +++ b/src/lib/ffmpeg_decoder.cc @@ -1,5 +1,3 @@ -/* -*- c-basic-offset: 8; default-tab-width: 8; -*- */ - /* Copyright (C) 2012 Carl Hetherington @@ -278,8 +276,6 @@ FFmpegDecoder::pass () } avsubtitle_free (&sub); } - } else { - cout << "[ffmpeg] other packet.\n"; } av_free_packet (&_packet); @@ -541,7 +537,7 @@ FFmpegDecoder::decode_audio_packet () ); assert (_audio_codec_context->channels == _ffmpeg_content->audio_channels()); - audio (deinterleave_audio (_frame->data, data_size), source_pts_seconds); + audio (deinterleave_audio (_frame->data, data_size), source_pts_seconds * TIME_HZ); } copy_packet.data += decode_result; -- cgit v1.2.3