Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 306921 | Differences between
and this patch

Collapse All | Expand All

(-)src.orig/third_party/ffmpeg-orig/ffmpeg.gyp (-3 / +3 lines)
Lines 147-153 Link Here
147
            '-fomit-frame-pointer',
147
            '-fomit-frame-pointer',
148
          ],
148
          ],
149
          'conditions': [
149
          'conditions': [
150
            ['ffmpeg_branding=="Chrome" or ffmpeg_branding=="ChromeOS"', {
150
            ['ffmpeg_branding=="Chrome" or ffmpeg_branding=="ChromeOS" or ffmpeg_branding=="Chromium"', {
151
              'sources': [
151
              'sources': [
152
                'source/patched-ffmpeg-mt/libavcodec/aac.c',
152
                'source/patched-ffmpeg-mt/libavcodec/aac.c',
153
                'source/patched-ffmpeg-mt/libavcodec/aac_ac3_parser.c',
153
                'source/patched-ffmpeg-mt/libavcodec/aac_ac3_parser.c',
Lines 240-246 Link Here
240
                'source/patched-ffmpeg-mt/libavcodec/x86/vp3dsp_sse2.c',
240
                'source/patched-ffmpeg-mt/libavcodec/x86/vp3dsp_sse2.c',
241
              ],
241
              ],
242
            }],
242
            }],
243
            ['(target_arch=="ia32" or target_arch=="x64") and (ffmpeg_branding=="ChromeOS" or ffmpeg_branding=="Chrome")', {
243
            ['(target_arch=="ia32" or target_arch=="x64") and (ffmpeg_branding=="ChromeOS" or ffmpeg_branding=="Chrome" or ffmpeg_branding=="Chromium")', {
244
              'dependencies': [
244
              'dependencies': [
245
                'make_ffmpeg_asm_lib',
245
                'make_ffmpeg_asm_lib',
246
              ],
246
              ],
Lines 299-305 Link Here
299
                'source/patched-ffmpeg-mt/libavcodec/arm/vp3dsp_neon.S', # TODO(fbarchard): Review this file.
299
                'source/patched-ffmpeg-mt/libavcodec/arm/vp3dsp_neon.S', # TODO(fbarchard): Review this file.
300
              ],
300
              ],
301
            }],  # target_arch=="arm"
301
            }],  # target_arch=="arm"
302
            ['target_arch=="arm" and (ffmpeg_branding=="Chrome" or ffmpeg_branding=="ChromeOS")', {
302
            ['target_arch=="arm" and (ffmpeg_branding=="Chrome" or ffmpeg_branding=="ChromeOS" or ffmpeg_branding=="Chromium")', {
303
              'sources': [
303
              'sources': [
304
	        # TODO(fbarchard): dsputil_neon code should be used by chromium
304
	        # TODO(fbarchard): dsputil_neon code should be used by chromium
305
		# for ogg, but with h264 references only if CONFIG_H264_DECODER
305
		# for ogg, but with h264 references only if CONFIG_H264_DECODER

Return to bug 306921