diff options
| author | fbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-11 08:51:52 +0000 |
|---|---|---|
| committer | fbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-11 08:51:52 +0000 |
| commit | b4535957c9a2da2cda908be1793110dc12e523be (patch) | |
| tree | deda79522337ba14887de435fbf153e2b3522f0d /media/ffmpeg | |
| parent | 5ceb5e9ce90a6287436857bed52dd98bc60330a0 (diff) | |
| download | chromium_src-b4535957c9a2da2cda908be1793110dc12e523be.zip chromium_src-b4535957c9a2da2cda908be1793110dc12e523be.tar.gz chromium_src-b4535957c9a2da2cda908be1793110dc12e523be.tar.bz2 | |
roll ffmpeg to nov 4 to fix clang issue
BUG=61931
TEST=none
Review URL: http://codereview.chromium.org/4770001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65784 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/ffmpeg')
| -rw-r--r-- | media/ffmpeg/ffmpeg_common.h | 1 | ||||
| -rw-r--r-- | media/ffmpeg/ffmpeg_unittest.cc | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/media/ffmpeg/ffmpeg_common.h b/media/ffmpeg/ffmpeg_common.h index 7b73781..4250233 100644 --- a/media/ffmpeg/ffmpeg_common.h +++ b/media/ffmpeg/ffmpeg_common.h @@ -17,6 +17,7 @@ extern "C" { // TODO(scherkus): fix and upstream the compiler warnings. MSVC_PUSH_DISABLE_WARNING(4244); #include <libavcodec/avcodec.h> +#include <libavcore/samplefmt.h> #include <libavformat/avformat.h> #include <libavformat/avio.h> #include <libavutil/avutil.h> diff --git a/media/ffmpeg/ffmpeg_unittest.cc b/media/ffmpeg/ffmpeg_unittest.cc index f9229a0..d6eebe2 100644 --- a/media/ffmpeg/ffmpeg_unittest.cc +++ b/media/ffmpeg/ffmpeg_unittest.cc @@ -272,7 +272,7 @@ class FFmpegTest : public testing::TestWithParam<const char*> { 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 / |