Revert 53281 - ffmpeg update with vp3 patches....

media/ffmpeg/ffmpeg_common.h

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MEDIA_FFMPEG_FFMPEG_COMMON_H_
 #define MEDIA_FFMPEG_FFMPEG_COMMON_H_
 
 // Used for FFmpeg error codes.
 #include <cerrno>
 
 #include "base/compiler_specific.h"
 #include "base/singleton.h"
 
 // Include FFmpeg header files.
 extern "C" {
 // Temporarily disable possible loss of data warning.
 // TODO(scherkus): fix and upstream the compiler warnings.
 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();
 }  // extern "C"
 
 namespace media {
 
 // Wraps FFmpeg's av_free() in a class that can be passed as a template argument
 // to scoped_ptr_malloc.
 class ScopedPtrAVFree {
@@ skipping 20 matching lines @@
 namespace mime_type {
 
 extern const char kFFmpegAudio[];
 extern const char kFFmpegVideo[];
 
 }  // namespace mime_type
 
 }  // namespace media
 
 #endif  // MEDIA_FFMPEG_FFMPEG_COMMON_H_