diff options
| author | fbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-22 00:42:17 +0000 |
|---|---|---|
| committer | fbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-22 00:42:17 +0000 |
| commit | 44430f7f48512dc0ae8c45d6313e5b8eb215f67e (patch) | |
| tree | 46927a0c46bb04c581ba702984e1f3fc5d9cb58c /media/ffmpeg | |
| parent | a355ba5577bed81d17332edb4d027f2ed834de5e (diff) | |
| download | chromium_src-44430f7f48512dc0ae8c45d6313e5b8eb215f67e.zip chromium_src-44430f7f48512dc0ae8c45d6313e5b8eb215f67e.tar.gz chromium_src-44430f7f48512dc0ae8c45d6313e5b8eb215f67e.tar.bz2 | |
Revert 53281 - ffmpeg update with vp3 patches.
switch to av_register_protocol2
video-played-collapse layout test fails and will be fixed later.
BUG=48037
TEST=ffmpeg should still build/run
Review URL: http://codereview.chromium.org/3010016
TBR=fbarchard@chromium.org
Review URL: http://codereview.chromium.org/2805098
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53285 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/ffmpeg')
| -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 7b73781..10f67d2 100644 --- a/media/ffmpeg/ffmpeg_common.h +++ b/media/ffmpeg/ffmpeg_common.h @@ -18,7 +18,6 @@ extern "C" { MSVC_PUSH_DISABLE_WARNING(4244); #include <libavcodec/avcodec.h> #include <libavformat/avformat.h> -#include <libavformat/avio.h> #include <libavutil/avutil.h> #include <libavutil/log.h> MSVC_POP_WARNING(); |