diff options
Diffstat (limited to 'www/chromium/files/patch-third__party_ffmpeg_ffmpeg__generated.gni')
| -rw-r--r-- | www/chromium/files/patch-third__party_ffmpeg_ffmpeg__generated.gni | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/www/chromium/files/patch-third__party_ffmpeg_ffmpeg__generated.gni b/www/chromium/files/patch-third__party_ffmpeg_ffmpeg__generated.gni index f4112d30167d..bf1c817a2ebd 100644 --- a/www/chromium/files/patch-third__party_ffmpeg_ffmpeg__generated.gni +++ b/www/chromium/files/patch-third__party_ffmpeg_ffmpeg__generated.gni @@ -1,4 +1,4 @@ ---- third_party/ffmpeg/ffmpeg_generated.gni.orig 2017-01-26 00:50:10 UTC +--- third_party/ffmpeg/ffmpeg_generated.gni.orig 2017-03-09 20:05:22 UTC +++ third_party/ffmpeg/ffmpeg_generated.gni @@ -12,7 +12,7 @@ ffmpeg_c_sources = [] ffmpeg_gas_sources = [] @@ -9,7 +9,7 @@ ffmpeg_c_sources += [ "libavcodec/allcodecs.c", "libavcodec/autorename_libavcodec_flacdec.c", -@@ -160,7 +160,7 @@ if ((is_android && current_cpu == "arm" +@@ -161,7 +161,7 @@ if ((is_android && current_cpu == "arm" ] } @@ -18,7 +18,7 @@ ffmpeg_c_sources += [ "libavcodec/autorename_libavcodec_hpeldsp.c", "libavcodec/autorename_libavcodec_videodsp.c", -@@ -175,7 +175,7 @@ if ((is_linux && current_cpu == "arm" && +@@ -176,7 +176,7 @@ if ((is_linux && current_cpu == "arm" && ] } @@ -27,7 +27,7 @@ ffmpeg_c_sources += [ "libavcodec/aac_ac3_parser.c", "libavcodec/aac_parser.c", -@@ -212,7 +212,7 @@ if ((current_cpu == "x64" && ffmpeg_bran +@@ -213,7 +213,7 @@ if ((current_cpu == "x64" && ffmpeg_bran ] } @@ -36,7 +36,7 @@ ffmpeg_c_sources += [ "libavcodec/x86/autorename_libavcodec_x86_vorbisdsp_init.c", "libavcodec/x86/constants.c", -@@ -225,7 +225,7 @@ if ((is_android && current_cpu == "x64") +@@ -226,7 +226,7 @@ if ((is_android && current_cpu == "x64") ] } @@ -45,7 +45,7 @@ ffmpeg_c_sources += [ "libavcodec/cabac.c", "libavcodec/h2645_parse.c", -@@ -257,7 +257,7 @@ if ((is_android && current_cpu == "arm" +@@ -258,7 +258,7 @@ if ((is_android && current_cpu == "arm" ] } @@ -54,7 +54,7 @@ ffmpeg_c_sources += [ "libavcodec/arm/fft_fixed_init_arm.c", "libavcodec/arm/fft_init_arm.c", -@@ -276,7 +276,7 @@ if ((is_android && current_cpu == "arm" +@@ -277,7 +277,7 @@ if ((is_android && current_cpu == "arm" ] } @@ -63,7 +63,7 @@ ffmpeg_yasm_sources += [ "libavcodec/x86/fft.asm", "libavcodec/x86/flacdsp.asm", -@@ -288,7 +288,7 @@ if ((is_android && current_cpu == "x64") +@@ -289,7 +289,7 @@ if ((is_android && current_cpu == "x64") ] } @@ -72,7 +72,7 @@ ffmpeg_c_sources += [ "libavcodec/x86/autorename_libavcodec_x86_videodsp_init.c", "libavcodec/x86/h264_intrapred_init.c", -@@ -308,7 +308,7 @@ if ((is_linux && current_cpu == "x64") | +@@ -309,7 +309,7 @@ if ((is_linux && current_cpu == "x64") | ] } @@ -81,7 +81,7 @@ ffmpeg_c_sources += [ "libavcodec/x86/aacpsdsp_init.c", "libavcodec/x86/dct_init.c", -@@ -317,7 +317,7 @@ if ((current_cpu == "x64" && ffmpeg_bran +@@ -318,7 +318,7 @@ if ((current_cpu == "x64" && ffmpeg_bran ] } @@ -90,7 +90,7 @@ ffmpeg_yasm_sources += [ "libavcodec/x86/aacpsdsp.asm", "libavcodec/x86/dct32.asm", -@@ -326,7 +326,7 @@ if ((current_cpu == "x64" && ffmpeg_bran +@@ -327,7 +327,7 @@ if ((current_cpu == "x64" && ffmpeg_bran ] } @@ -99,7 +99,7 @@ ffmpeg_c_sources += [ "libavcodec/arm/h264pred_init_arm.c", "libavcodec/arm/hpeldsp_init_arm.c", -@@ -346,13 +346,13 @@ if ((is_linux && current_cpu == "arm" && +@@ -347,13 +347,13 @@ if ((is_linux && current_cpu == "arm" && ] } @@ -115,7 +115,7 @@ ffmpeg_c_sources += [ "libavcodec/acelp_filters.c", "libavcodec/acelp_pitch_delay.c", -@@ -407,7 +407,7 @@ if ((is_linux && current_cpu == "arm" && +@@ -408,7 +408,7 @@ if ((is_linux && current_cpu == "arm" && ] } @@ -124,7 +124,7 @@ ffmpeg_c_sources += [ "libavcodec/aarch64/fft_init_aarch64.c", "libavcodec/aarch64/vorbisdsp_init.c", -@@ -422,7 +422,7 @@ if ((is_android && current_cpu == "arm64 +@@ -423,7 +423,7 @@ if ((is_android && current_cpu == "arm64 ] } @@ -133,7 +133,7 @@ ffmpeg_c_sources += [ "libavcodec/arm/aacpsdsp_init_arm.c", "libavcodec/arm/mpegaudiodsp_init_arm.c", -@@ -433,7 +433,7 @@ if ((is_android && current_cpu == "arm" +@@ -434,7 +434,7 @@ if ((is_android && current_cpu == "arm" ] } @@ -142,7 +142,7 @@ ffmpeg_c_sources += [ "libavutil/arm/float_dsp_init_neon.c", ] -@@ -448,7 +448,7 @@ if ((is_android && current_cpu == "arm" +@@ -449,7 +449,7 @@ if ((is_android && current_cpu == "arm" ] } @@ -151,7 +151,7 @@ ffmpeg_c_sources += [ "libavcodec/arm/h264chroma_init_arm.c", "libavcodec/arm/h264dsp_init_arm.c", -@@ -459,7 +459,7 @@ if ((is_linux && current_cpu == "arm" && +@@ -460,7 +460,7 @@ if ((is_linux && current_cpu == "arm" && ] } @@ -160,7 +160,7 @@ ffmpeg_c_sources += [ "libavcodec/x86/h264_qpel.c", "libavcodec/x86/h264chroma_init.c", -@@ -480,7 +480,7 @@ if ((is_linux && current_cpu == "x64" && +@@ -481,7 +481,7 @@ if ((is_linux && current_cpu == "x64" && ] } @@ -169,7 +169,7 @@ ffmpeg_c_sources += [ "libavcodec/mips/aacdec_mips.c", "libavcodec/mips/aacpsdsp_mips.c", -@@ -489,7 +489,7 @@ if ((is_android && current_cpu == "mips6 +@@ -490,7 +490,7 @@ if ((is_android && current_cpu == "mips6 ] } @@ -178,7 +178,7 @@ ffmpeg_c_sources += [ "libavcodec/mips/h264pred_init_mips.c", "libavcodec/mips/hpeldsp_init_mips.c", -@@ -497,7 +497,7 @@ if (is_linux && current_cpu == "mipsel") +@@ -498,7 +498,7 @@ if (is_linux && current_cpu == "mipsel") ] } @@ -187,7 +187,7 @@ ffmpeg_c_sources += [ "libavcodec/mips/h264chroma_init_mips.c", "libavcodec/mips/h264dsp_init_mips.c", -@@ -505,7 +505,7 @@ if ((is_linux && current_cpu == "mipsel" +@@ -506,7 +506,7 @@ if ((is_linux && current_cpu == "mipsel" ] } @@ -196,7 +196,7 @@ ffmpeg_c_sources += [ "libavcodec/aarch64/h264pred_init.c", "libavcodec/aarch64/hpeldsp_init_aarch64.c", -@@ -518,7 +518,7 @@ if (is_linux && current_cpu == "arm64") +@@ -519,7 +519,7 @@ if (is_linux && current_cpu == "arm64") ] } @@ -205,7 +205,7 @@ ffmpeg_c_sources += [ "libavcodec/aarch64/imdct15_init.c", "libavcodec/aarch64/mpegaudiodsp_init.c", -@@ -529,7 +529,7 @@ if ((is_android && current_cpu == "arm64 +@@ -530,7 +530,7 @@ if ((is_android && current_cpu == "arm64 ] } @@ -214,7 +214,7 @@ ffmpeg_c_sources += [ "libavcodec/aarch64/h264chroma_init_aarch64.c", "libavcodec/aarch64/h264dsp_init_aarch64.c", -@@ -543,7 +543,7 @@ if ((is_linux && current_cpu == "arm64" +@@ -544,7 +544,7 @@ if ((is_linux && current_cpu == "arm64" ] } @@ -223,7 +223,7 @@ ffmpeg_c_sources += [ "libavcodec/arm/hpeldsp_init_neon.c", "libavcodec/arm/vp8dsp_init_neon.c", -@@ -556,14 +556,14 @@ if (is_linux && current_cpu == "arm" && +@@ -557,14 +557,14 @@ if (is_linux && current_cpu == "arm" && ] } @@ -240,7 +240,7 @@ ffmpeg_c_sources += [ "libavcodec/arm/blockdsp_init_arm.c", "libavcodec/arm/idctdsp_init_arm.c", -@@ -587,13 +587,13 @@ if ((is_linux && current_cpu == "arm" && +@@ -588,13 +588,13 @@ if ((is_linux && current_cpu == "arm" && ] } @@ -256,7 +256,7 @@ ffmpeg_gas_sources += [ "libavcodec/arm/h264cmc_neon.S", "libavcodec/arm/h264dsp_neon.S", -@@ -608,7 +608,7 @@ if (is_win && current_cpu == "x64") { +@@ -609,7 +609,7 @@ if (is_win && current_cpu == "x64") { ] } @@ -265,7 +265,7 @@ ffmpeg_c_sources += [ "libavcodec/x86/blockdsp_init.c", "libavcodec/x86/fdct.c", -@@ -635,7 +635,7 @@ if ((is_linux && current_cpu == "x64" && +@@ -636,7 +636,7 @@ if ((is_linux && current_cpu == "x64" && ] } @@ -274,7 +274,7 @@ ffmpeg_c_sources += [ "libavcodec/mips/blockdsp_init_mips.c", "libavcodec/mips/h263dsp_init_mips.c", -@@ -648,7 +648,7 @@ if (is_linux && current_cpu == "mipsel" +@@ -649,7 +649,7 @@ if (is_linux && current_cpu == "mipsel" ] } |