diff options
Diffstat (limited to '')
| -rw-r--r-- | media/ffvpx/libavcodec/moz.build | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/media/ffvpx/libavcodec/moz.build b/media/ffvpx/libavcodec/moz.build index 886fa7a2cb..6f09049a60 100644 --- a/media/ffvpx/libavcodec/moz.build +++ b/media/ffvpx/libavcodec/moz.build @@ -15,6 +15,8 @@ if CONFIG['FFVPX_ASFLAGS']: if CONFIG['TARGET_CPU'] == 'aarch64': DIRS += ['aarch64'] +DIRS += ['bsf'] + LOCAL_INCLUDES += ['/modules/fdlibm/inexact-math-override'] SharedLibrary('mozavcodec') @@ -23,8 +25,6 @@ SOURCES += [ 'audio_frame_queue.c', 'avcodec.c', 'avdct.c', - 'avfft.c', - 'avpacket.c', 'bitstream.c', 'bitstream_filters.c', 'bsf.c', @@ -62,8 +62,8 @@ SOURCES += [ 'mpegaudiodsp_fixed.c', 'mpegaudiodsp_float.c', 'mpegaudiotabs.c', - 'null_bsf.c', 'options.c', + 'packet.c', 'parser.c', 'parsers.c', 'pcm.c', @@ -85,10 +85,8 @@ SOURCES += [ if not CONFIG['MOZ_FFVPX_AUDIOONLY']: SOURCES += [ 'atsc_a53.c', - 'av1_frame_split_bsf.c', 'av1_parse.c', 'av1dec.c', - 'avpicture.c', 'cbs.c', 'cbs_av1.c', 'golomb.c', @@ -109,7 +107,6 @@ if not CONFIG['MOZ_FFVPX_AUDIOONLY']: 'vp8dsp.c', 'vp9.c', 'vp9_parser.c', - 'vp9_superframe_split_bsf.c', 'vp9block.c', 'vp9data.c', 'vp9dsp.c', @@ -143,6 +140,11 @@ LOCAL_INCLUDES += [ '/media/libvorbis', ] +c11_flags = ["-std=gnu11"] +if CONFIG["CC_TYPE"] == "clang-cl": + c11_flags.insert(0, "-Xclang") +CFLAGS += c11_flags + if not CONFIG["MOZ_SYSTEM_LIBVPX"]: LOCAL_INCLUDES += ['/media/libvpx'] else: |