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

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

BUG=118986, 91970
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=166557

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

https://codereview.chromium.org/11364077/diff/1/media/filters/ffmpeg_glue.h
File media/filters/ffmpeg_glue.h (right):

https://codereview.chromium.org/11364077/diff/1/media/filters/ffmpeg_glue.h#n...
media/filters/ffmpeg_glue.h:31: #include "media/ffmpeg/ffmpeg_common.h"
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]

https://codereview.chromium.org/11364077/diff/1/media/filters/ffmpeg_glue.h
File media/filters/ffmpeg_glue.h (right):

https://codereview.chromium.org/11364077/diff/1/media/filters/ffmpeg_glue.h#n...
media/filters/ffmpeg_glue.h:31: #include "media/ffmpeg/ffmpeg_common.h"
On 2012/11/05 19:24:31, DaleCurtis wrote:
> 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?

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]

https://codereview.chromium.org/11364077/diff/1/media/filters/ffmpeg_glue.h
File media/filters/ffmpeg_glue.h (right):

https://codereview.chromium.org/11364077/diff/1/media/filters/ffmpeg_glue.h#n...
media/filters/ffmpeg_glue.h:31: #include "media/ffmpeg/ffmpeg_common.h"
On 2012/11/05 19:31:37, Paweł Hajdan Jr. wrote:
> On 2012/11/05 19:24:31, DaleCurtis wrote:
> > 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?
> 
> In vanilla ffmpeg it is a typedef, so I had to include the original headers
for
> the typedef.

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/

[Paweł Hajdan Jr., 2012-11-06 18:25:01]

PTAL

Thanks for the link to upstream commit! Indeed, things work with bleeding-edge
ffmpeg from git.

[DaleCurtis, 2012-11-06 18:41:21]

https://codereview.chromium.org/11364077/diff/4001/build/common.gypi
File build/common.gypi (right):

https://codereview.chromium.org/11364077/diff/4001/build/common.gypi#newcode1939
build/common.gypi:1939: '__STDC_CONSTANT_MACROS',
As the bots are indicating, I think you'll have to find a more precise location
for this.

[Paweł Hajdan Jr., 2012-11-06 18:48:18]

https://codereview.chromium.org/11364077/diff/4001/build/common.gypi
File build/common.gypi (right):

https://codereview.chromium.org/11364077/diff/4001/build/common.gypi#newcode1939
build/common.gypi:1939: '__STDC_CONSTANT_MACROS',
On 2012/11/06 18:41:21, DaleCurtis wrote:
> As the bots are indicating, I think you'll have to find a more precise
location
> for this.

Don't worry about those, I have a patch ready:
https://codereview.appspot.com/6810088/

[DaleCurtis, 2012-11-06 19:02:11]

lgtm then.

[commit-bot: I haz the power, 2012-11-07 21:20:43]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/phajdan.jr@chromium.org/11364077/9001