Chromium Code Reviews

Unified Diff: media/ffmpeg/ffmpeg_unittest.cc

Issue 4770001: roll ffmpeg to nov 4 to fix clang issue (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
« media/ffmpeg/ffmpeg_common.h ('K') | « media/ffmpeg/ffmpeg_common.h ('k') | media/filters/ffmpeg_audio_decoder.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/ffmpeg/ffmpeg_unittest.cc
===================================================================
--- media/ffmpeg/ffmpeg_unittest.cc (revision 65689)
+++ media/ffmpeg/ffmpeg_unittest.cc (working copy)
@@ -272,7 +272,7 @@
if (result > 0) {
// TODO(scherkus): move this to ffmpeg_util.h and dedup.
int64 denominator = av_audio_context()->channels *
- av_get_bits_per_sample_format(av_audio_context()->sample_fmt) / 8 *
+ av_get_bits_per_sample_fmt(av_audio_context()->sample_fmt) / 8 *
av_audio_context()->sample_rate;
double microseconds = size_out /
(denominator /
« media/ffmpeg/ffmpeg_common.h ('K') | « media/ffmpeg/ffmpeg_common.h ('k') | media/filters/ffmpeg_audio_decoder.cc » ('j') | no next file with comments »

Powered by Google App Engine