Linux: fix build with system ffmpeg (Chromium side).

media/filters/ffmpeg_glue.h

 // Copyright (c) 2012 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.
 
 // FFmpegGlue is an interface between FFmpeg and Chrome used to proxy FFmpeg's
 // read and seek requests to Chrome's internal data structures.  The glue works
 // through the AVIO interface provided by FFmpeg.
 //
 // AVIO works through a special AVIOContext created through avio_alloc_context()
 // which is attached to the AVFormatContext used for demuxing.  The AVIO context
@@ skipping 10 matching lines @@
 // FFmpegGlue is also responsible for initializing FFmpeg, which is done once
 // per process.  Initialization includes: turning off log messages, registering
 // a lock manager, and finally registering all demuxers and codecs.
 
 #ifndef MEDIA_FILTERS_FFMPEG_GLUE_H_
 #define MEDIA_FILTERS_FFMPEG_GLUE_H_
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "media/base/media_export.h"
+#include "media/ffmpeg/ffmpeg_common.h"

[DaleCurtis, 2012/11/05 19:24:31]

You can't include this header in other .h files since it heavily pollutes the
name space by loading all the ffmpeg headers.

Why was it necessary to remove the forward declaration for AVIOContext?

[Paweł Hajdan Jr., 2012/11/05 19:31:37]

In vanilla ffmpeg it is a typedef, so I had to include the original headers for
the typedef.

[DaleCurtis, 2012/11/05 19:34:41]

I submitted an upstream patch to fix this a while back, distros will need to
pull a more recent version of ffmpeg/libav for this.

http://patches.libav.org/patch/27817/

 
 struct AVFormatContext;
-struct AVIOContext;
 
 namespace media {
 
 class ScopedPtrAVFree;
 
 class MEDIA_EXPORT FFmpegURLProtocol {
  public:
   // Read the given amount of bytes into data, returns the number of bytes read
   // if successful, kReadError otherwise.
   virtual int Read(int size, uint8* data) = 0;
@@ skipping 30 matching lines @@
   bool open_called_;
   AVFormatContext* format_context_;
   scoped_ptr_malloc<AVIOContext, ScopedPtrAVFree> avio_context_;
 
   DISALLOW_COPY_AND_ASSIGN(FFmpegGlue);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_FFMPEG_GLUE_H_