diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-01 19:30:32 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-01 19:30:32 +0000 |
| commit | 2c797994373f4cf5e6b4c27b502202d5aeb946a3 (patch) | |
| tree | f11cd53649fa478331aa68da8890943d7d3f5868 /media | |
| parent | 896e233176a3d047d558f34d2082d6cc1b6ed452 (diff) | |
| download | chromium_src-2c797994373f4cf5e6b4c27b502202d5aeb946a3.zip chromium_src-2c797994373f4cf5e6b4c27b502202d5aeb946a3.tar.gz chromium_src-2c797994373f4cf5e6b4c27b502202d5aeb946a3.tar.bz2 | |
Fix samplefmt.h inclusion with newer ffmpeg
libavcore is defunct in upstream ffmpeg.
Patch by floppymaster@gmail.com:
http://codereview.chromium.org/6791004/
BUG=77795
TEST=Build with recent ffmpeg (use_system_ffmpeg=1)
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80200 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
| -rw-r--r-- | media/ffmpeg/ffmpeg_common.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/media/ffmpeg/ffmpeg_common.h b/media/ffmpeg/ffmpeg_common.h index dcdc2d8..4db601c 100644 --- a/media/ffmpeg/ffmpeg_common.h +++ b/media/ffmpeg/ffmpeg_common.h @@ -19,7 +19,6 @@ 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> |