diff --git a/StepmaniaCore.cmake b/StepmaniaCore.cmake index fe8bd1e302..b736901ac1 100644 --- a/StepmaniaCore.cmake +++ b/StepmaniaCore.cmake @@ -280,29 +280,44 @@ if(WIN32) set(HAS_FFMPEG TRUE) else() # FFMPEG...it can be evil. + if(SIZEOF_INTPTR_T EQUAL 8) + set(SM_WIN32_ARCH "x64") + else() + set(SM_WIN32_ARCH "x86") + endif() find_library(LIB_SWSCALE NAMES "swscale" - PATHS "${SM_EXTERN_DIR}/ffmpeg/lib" + PATHS "${SM_EXTERN_DIR}/ffmpeg/${SM_WIN32_ARCH}/lib" NO_DEFAULT_PATH) get_filename_component(LIB_SWSCALE ${LIB_SWSCALE} NAME) find_library(LIB_AVCODEC NAMES "avcodec" - PATHS "${SM_EXTERN_DIR}/ffmpeg/lib" + PATHS "${SM_EXTERN_DIR}/ffmpeg/${SM_WIN32_ARCH}/lib" NO_DEFAULT_PATH) get_filename_component(LIB_AVCODEC ${LIB_AVCODEC} NAME) find_library(LIB_AVFORMAT NAMES "avformat" - PATHS "${SM_EXTERN_DIR}/ffmpeg/lib" + PATHS "${SM_EXTERN_DIR}/ffmpeg/${SM_WIN32_ARCH}/lib" NO_DEFAULT_PATH) get_filename_component(LIB_AVFORMAT ${LIB_AVFORMAT} NAME) find_library(LIB_AVUTIL NAMES "avutil" - PATHS "${SM_EXTERN_DIR}/ffmpeg/lib" + PATHS "${SM_EXTERN_DIR}/ffmpeg/${SM_WIN32_ARCH}/lib" NO_DEFAULT_PATH) get_filename_component(LIB_AVUTIL ${LIB_AVUTIL} NAME) + + list(APPEND SM_FFMPEG_WIN32_DLLS + "${SM_EXTERN_DIR}/ffmpeg/${SM_WIN32_ARCH}/bin/avcodec-55.dll" + "${SM_EXTERN_DIR}/ffmpeg/${SM_WIN32_ARCH}/bin/avformat-55.dll" + "${SM_EXTERN_DIR}/ffmpeg/${SM_WIN32_ARCH}/bin/avutil-52.dll" + "${SM_EXTERN_DIR}/ffmpeg/${SM_WIN32_ARCH}/bin/swscale-2.dll" + ) + foreach(dll ${SM_FFMPEG_WIN32_DLLS}) + file(COPY "${dll}" DESTINATION "${SM_PROGRAM_DIR}/") + endforeach() endif() elseif(MACOSX) if(WITH_FFMPEG AND NOT WITH_SYSTEM_FFMPEG) diff --git a/extern/ffmpeg/x64/bin/avcodec-55.dll b/extern/ffmpeg/x64/bin/avcodec-55.dll new file mode 100644 index 0000000000..4d19dce2c3 Binary files /dev/null and b/extern/ffmpeg/x64/bin/avcodec-55.dll differ diff --git a/extern/ffmpeg/x64/bin/avformat-55.dll b/extern/ffmpeg/x64/bin/avformat-55.dll new file mode 100644 index 0000000000..c0afc4ac09 Binary files /dev/null and b/extern/ffmpeg/x64/bin/avformat-55.dll differ diff --git a/extern/ffmpeg/x64/bin/avutil-52.dll b/extern/ffmpeg/x64/bin/avutil-52.dll new file mode 100644 index 0000000000..bf6bf52931 Binary files /dev/null and b/extern/ffmpeg/x64/bin/avutil-52.dll differ diff --git a/extern/ffmpeg/x64/bin/swscale-2.dll b/extern/ffmpeg/x64/bin/swscale-2.dll new file mode 100644 index 0000000000..6fd326360c Binary files /dev/null and b/extern/ffmpeg/x64/bin/swscale-2.dll differ diff --git a/extern/ffmpeg/x64/lib/avcodec-55.def b/extern/ffmpeg/x64/lib/avcodec-55.def new file mode 100644 index 0000000000..4d964046f6 --- /dev/null +++ b/extern/ffmpeg/x64/lib/avcodec-55.def @@ -0,0 +1,281 @@ +EXPORTS + audio_resample + audio_resample_close + av_audio_convert + av_audio_convert_alloc + av_audio_convert_free + av_audio_resample_init + av_bitstream_filter_close + av_bitstream_filter_filter + av_bitstream_filter_init + av_bitstream_filter_next + av_codec_get_codec_descriptor + av_codec_get_lowres + av_codec_get_max_lowres + av_codec_get_pkt_timebase + av_codec_get_seek_preroll + av_codec_is_decoder + av_codec_is_encoder + av_codec_next + av_codec_set_codec_descriptor + av_codec_set_lowres + av_codec_set_pkt_timebase + av_codec_set_seek_preroll + av_copy_packet + av_copy_packet_side_data + av_dct_calc + av_dct_end + av_dct_init + av_destruct_packet + av_dup_packet + av_fast_malloc + av_fast_padded_malloc + av_fast_padded_mallocz + av_fast_realloc + av_fft_calc + av_fft_end + av_fft_init + av_fft_permute + av_free_packet + av_get_audio_frame_duration + av_get_bits_per_sample + av_get_codec_tag_string + av_get_exact_bits_per_sample + av_get_pcm_codec + av_get_profile_name + av_grow_packet + av_hwaccel_next + av_imdct_calc + av_imdct_half + av_init_packet + av_lockmgr_register + av_log_ask_for_sample + av_log_missing_feature + av_mdct_calc + av_mdct_end + av_mdct_init + av_new_packet + av_packet_copy_props + av_packet_free_side_data + av_packet_from_data + av_packet_get_side_data + av_packet_merge_side_data + av_packet_move_ref + av_packet_new_side_data + av_packet_ref + av_packet_shrink_side_data + av_packet_split_side_data + av_packet_unref + av_parser_change + av_parser_close + av_parser_init + av_parser_next + av_parser_parse2 + av_picture_copy + av_picture_crop + av_picture_pad + av_rdft_calc + av_rdft_end + av_rdft_init + av_register_bitstream_filter + av_register_codec_parser + av_register_hwaccel + av_resample + av_resample_close + av_resample_compensate + av_resample_init + av_shrink_packet + av_xiphlacing + available_bits + avcodec_align_dimensions + avcodec_align_dimensions2 + avcodec_alloc_context3 + avcodec_alloc_frame + avcodec_chroma_pos_to_enum + avcodec_close + avcodec_configuration + avcodec_copy_context + avcodec_decode_audio3 + avcodec_decode_audio4 + avcodec_decode_subtitle2 + avcodec_decode_video2 + avcodec_default_execute + avcodec_default_execute2 + avcodec_default_get_buffer + avcodec_default_get_buffer2 + avcodec_default_get_format + avcodec_default_reget_buffer + avcodec_default_release_buffer + avcodec_descriptor_get + avcodec_descriptor_get_by_name + avcodec_descriptor_next + avcodec_encode_audio + avcodec_encode_audio2 + avcodec_encode_subtitle + avcodec_encode_video + avcodec_encode_video2 + avcodec_enum_to_chroma_pos + avcodec_fill_audio_frame + avcodec_find_best_pix_fmt2 + avcodec_find_best_pix_fmt_of_2 + avcodec_find_best_pix_fmt_of_list + avcodec_find_decoder + avcodec_find_decoder_by_name + avcodec_find_encoder + avcodec_find_encoder_by_name + avcodec_flush_buffers + avcodec_free_frame + avcodec_get_chroma_sub_sample + avcodec_get_class + avcodec_get_context_defaults3 + avcodec_get_edge_width + avcodec_get_frame_class + avcodec_get_frame_defaults + avcodec_get_name + avcodec_get_pix_fmt_loss + avcodec_get_subtitle_rect_class + avcodec_get_type + avcodec_is_open + avcodec_license + avcodec_open2 + avcodec_pix_fmt_to_codec_tag + avcodec_register + avcodec_register_all + avcodec_set_dimensions + avcodec_string + avcodec_version + aver_isf_history + avpicture_alloc + avpicture_deinterlace + avpicture_fill + avpicture_free + avpicture_get_size + avpicture_layout + avpriv_aac_parse_header + avpriv_ac3_channel_layout_tab DATA + avpriv_ac3_parse_header + avpriv_adx_decode_header + avpriv_align_put_bits + avpriv_bprint_to_extradata + avpriv_color_frame + avpriv_copy_bits + avpriv_copy_pce_data + avpriv_dca_sample_rates DATA + avpriv_dirac_parse_sequence_header + avpriv_dnxhd_get_frame_size + avpriv_dsputil_init + avpriv_dv_codec_profile + avpriv_dv_frame_profile + avpriv_dv_frame_profile2 + avpriv_find_pix_fmt + avpriv_find_start_code + avpriv_flac_is_extradata_valid + avpriv_flac_parse_block_header + avpriv_flac_parse_streaminfo + avpriv_h264_has_num_reorder_frames + avpriv_lock_avformat + avpriv_mjpeg_bits_ac_chrominance DATA + avpriv_mjpeg_bits_ac_luminance DATA + avpriv_mjpeg_bits_dc_chrominance DATA + avpriv_mjpeg_bits_dc_luminance DATA + avpriv_mjpeg_val_ac_chrominance DATA + avpriv_mjpeg_val_ac_luminance DATA + avpriv_mjpeg_val_dc DATA + avpriv_mpa_bitrate_tab DATA + avpriv_mpa_decode_header + avpriv_mpa_freq_tab DATA + avpriv_mpeg4audio_get_config + avpriv_mpeg4audio_sample_rates DATA + avpriv_mpegaudio_decode_header + avpriv_put_string + avpriv_split_xiph_headers + avpriv_tak_parse_streaminfo + avpriv_toupper4 + avpriv_unlock_avformat + avpriv_vorbis_parse_extradata + avpriv_vorbis_parse_frame + avpriv_vorbis_parse_reset + avsubtitle_free + dsputil_init + ff_aanscales DATA + ff_dct32_fixed + ff_dct32_float + ff_dct32_float_avx DATA + ff_dct32_float_sse DATA + ff_dct32_float_sse2 DATA + ff_dct_common_init + ff_dct_encode_init + ff_dct_encode_init_x86 + ff_dct_end + ff_dct_init + ff_dct_init_x86 + ff_dct_quantize_c + ff_dnxhd_cid_table DATA + ff_dnxhd_get_cid_table + ff_dsputil_init + ff_faandct + ff_faandct248 + ff_faanidct + ff_faanidct_add + ff_faanidct_put + ff_fdct248_islow_10 + ff_fdct248_islow_8 + ff_fdct_ifast + ff_fdct_ifast248 + ff_fdct_mmx + ff_fdct_mmxext + ff_fdct_sse2 + ff_fft_calc_avx DATA + ff_fft_calc_sse DATA + ff_fft_end + ff_fft_end_fixed + ff_fft_end_fixed_32 + ff_fft_init + ff_fft_init_fixed + ff_fft_init_fixed_32 + ff_fft_init_x86 + ff_fft_lut_init + ff_fft_permute_sse DATA + ff_idct_xvid_mmx + ff_idct_xvid_mmx_add + ff_idct_xvid_mmx_put + ff_idct_xvid_mmxext + ff_idct_xvid_mmxext_add + ff_idct_xvid_mmxext_put + ff_idct_xvid_sse2 + ff_idct_xvid_sse2_add + ff_idct_xvid_sse2_put + ff_jpeg_fdct_islow_10 + ff_jpeg_fdct_islow_8 + ff_mdct_calc_c + ff_mdct_calc_c_fixed + ff_mdct_calc_c_fixed_32 + ff_mdct_calcw_c + ff_mdct_end + ff_mdct_end_fixed + ff_mdct_end_fixed_32 + ff_mdct_init + ff_mdct_init_fixed + ff_mdct_init_fixed_32 + ff_mdct_win_fixed DATA + ff_mdct_win_float DATA + ff_prores_idct_put_10_sse2 DATA + ff_raw_pix_fmt_tags DATA + ff_rdft_end + ff_rdft_init + ff_simple_idct248_put + ff_simple_idct44_add + ff_simple_idct48_add + ff_simple_idct84_add + ff_simple_idct_10 + ff_simple_idct_12 + ff_simple_idct_8 + ff_simple_idct_add_10 + ff_simple_idct_add_12 + ff_simple_idct_add_8 + ff_simple_idct_add_mmx + ff_simple_idct_mmx + ff_simple_idct_put_10 + ff_simple_idct_put_12 + ff_simple_idct_put_8 + ff_simple_idct_put_mmx diff --git a/extern/ffmpeg/x64/lib/avcodec.lib b/extern/ffmpeg/x64/lib/avcodec.lib new file mode 100644 index 0000000000..bcb7dd7e34 Binary files /dev/null and b/extern/ffmpeg/x64/lib/avcodec.lib differ diff --git a/extern/ffmpeg/lib/avdevice-55.def b/extern/ffmpeg/x64/lib/avdevice-55.def similarity index 100% rename from extern/ffmpeg/lib/avdevice-55.def rename to extern/ffmpeg/x64/lib/avdevice-55.def diff --git a/extern/ffmpeg/x64/lib/avdevice.lib b/extern/ffmpeg/x64/lib/avdevice.lib new file mode 100644 index 0000000000..cd0b0d4dc8 Binary files /dev/null and b/extern/ffmpeg/x64/lib/avdevice.lib differ diff --git a/extern/ffmpeg/lib/avfilter-3.def b/extern/ffmpeg/x64/lib/avfilter-3.def similarity index 100% rename from extern/ffmpeg/lib/avfilter-3.def rename to extern/ffmpeg/x64/lib/avfilter-3.def diff --git a/extern/ffmpeg/x64/lib/avfilter.lib b/extern/ffmpeg/x64/lib/avfilter.lib new file mode 100644 index 0000000000..7787a482fe Binary files /dev/null and b/extern/ffmpeg/x64/lib/avfilter.lib differ diff --git a/extern/ffmpeg/lib/avformat-55.def b/extern/ffmpeg/x64/lib/avformat-55.def similarity index 100% rename from extern/ffmpeg/lib/avformat-55.def rename to extern/ffmpeg/x64/lib/avformat-55.def diff --git a/extern/ffmpeg/x64/lib/avformat.lib b/extern/ffmpeg/x64/lib/avformat.lib new file mode 100644 index 0000000000..e1a8dba43b Binary files /dev/null and b/extern/ffmpeg/x64/lib/avformat.lib differ diff --git a/extern/ffmpeg/x64/lib/avutil-52.def b/extern/ffmpeg/x64/lib/avutil-52.def new file mode 100644 index 0000000000..e355c8157f --- /dev/null +++ b/extern/ffmpeg/x64/lib/avutil-52.def @@ -0,0 +1,418 @@ +EXPORTS + av_add_q + av_adler32_update + av_aes_alloc + av_aes_crypt + av_aes_init + av_aes_size DATA + av_asprintf + av_audio_fifo_alloc + av_audio_fifo_drain + av_audio_fifo_free + av_audio_fifo_read + av_audio_fifo_realloc + av_audio_fifo_reset + av_audio_fifo_size + av_audio_fifo_space + av_audio_fifo_write + av_base64_decode + av_base64_encode + av_basename + av_blowfish_crypt + av_blowfish_crypt_ecb + av_blowfish_init + av_bmg_get + av_bprint_append_data + av_bprint_channel_layout + av_bprint_chars + av_bprint_clear + av_bprint_escape + av_bprint_finalize + av_bprint_get_buffer + av_bprint_init + av_bprint_init_for_buffer + av_bprint_strftime + av_bprintf + av_buffer_alloc + av_buffer_allocz + av_buffer_create + av_buffer_default_free + av_buffer_get_opaque + av_buffer_get_ref_count + av_buffer_is_writable + av_buffer_make_writable + av_buffer_pool_get + av_buffer_pool_init + av_buffer_pool_uninit + av_buffer_realloc + av_buffer_ref + av_buffer_unref + av_calloc + av_channel_layout_extract_channel + av_compare_mod + av_compare_ts + av_cpu_count + av_crc + av_crc_get_table + av_crc_init + av_ctz + av_d2q + av_d2str + av_dbl2ext + av_dbl2int + av_default_get_category + av_default_item_name + av_des_crypt + av_des_init + av_des_mac + av_dict_copy + av_dict_count + av_dict_free + av_dict_get + av_dict_parse_string + av_dict_set + av_dirname + av_div_q + av_dynarray2_add + av_dynarray_add + av_escape + av_evaluate_lls + av_expr_eval + av_expr_free + av_expr_parse + av_expr_parse_and_eval + av_ext2dbl + av_fifo_alloc + av_fifo_drain + av_fifo_free + av_fifo_generic_read + av_fifo_generic_write + av_fifo_grow + av_fifo_realloc2 + av_fifo_reset + av_fifo_size + av_fifo_space + av_file_map + av_file_unmap + av_find_info_tag + av_find_nearest_q_idx + av_find_opt + av_flt2int + av_force_cpu_flags + av_frame_alloc + av_frame_clone + av_frame_copy_props + av_frame_free + av_frame_get_best_effort_timestamp + av_frame_get_buffer + av_frame_get_channel_layout + av_frame_get_channels + av_frame_get_color_range + av_frame_get_colorspace + av_frame_get_decode_error_flags + av_frame_get_metadata + av_frame_get_pkt_duration + av_frame_get_pkt_pos + av_frame_get_pkt_size + av_frame_get_plane_buffer + av_frame_get_qp_table + av_frame_get_sample_rate + av_frame_get_side_data + av_frame_is_writable + av_frame_make_writable + av_frame_move_ref + av_frame_new_side_data + av_frame_ref + av_frame_set_best_effort_timestamp + av_frame_set_channel_layout + av_frame_set_channels + av_frame_set_color_range + av_frame_set_colorspace + av_frame_set_decode_error_flags + av_frame_set_metadata + av_frame_set_pkt_duration + av_frame_set_pkt_pos + av_frame_set_pkt_size + av_frame_set_qp_table + av_frame_set_sample_rate + av_frame_unref + av_free + av_freep + av_gcd + av_get_alt_sample_fmt + av_get_bits_per_pixel + av_get_bits_per_sample_fmt + av_get_bytes_per_sample + av_get_channel_description + av_get_channel_layout + av_get_channel_layout_channel_index + av_get_channel_layout_nb_channels + av_get_channel_layout_string + av_get_channel_name + av_get_colorspace_name + av_get_cpu_flags + av_get_default_channel_layout + av_get_double + av_get_int + av_get_known_color_name + av_get_media_type_string + av_get_packed_sample_fmt + av_get_padded_bits_per_pixel + av_get_picture_type_char + av_get_pix_fmt + av_get_pix_fmt_name + av_get_pix_fmt_string + av_get_planar_sample_fmt + av_get_q + av_get_random_seed + av_get_sample_fmt + av_get_sample_fmt_name + av_get_sample_fmt_string + av_get_standard_channel_layout + av_get_string + av_get_token + av_gettime + av_hash_alloc + av_hash_final + av_hash_freep + av_hash_get_name + av_hash_get_size + av_hash_init + av_hash_names + av_hash_update + av_hmac_alloc + av_hmac_calc + av_hmac_final + av_hmac_free + av_hmac_init + av_hmac_update + av_image_alloc + av_image_check_size + av_image_copy + av_image_copy_plane + av_image_copy_to_buffer + av_image_fill_arrays + av_image_fill_linesizes + av_image_fill_max_pixsteps + av_image_fill_pointers + av_image_get_buffer_size + av_image_get_linesize + av_init_lls + av_int2dbl + av_int2flt + av_int_list_length_for_size + av_isdigit + av_isgraph + av_isspace + av_isxdigit + av_lfg_init + av_log + av_log2 + av_log2_16bit + av_log_default_callback + av_log_format_line + av_log_get_level + av_log_set_callback + av_log_set_flags + av_log_set_level + av_lzo1x_decode + av_malloc + av_mallocz + av_max_alloc + av_md5_alloc + av_md5_final + av_md5_init + av_md5_size DATA + av_md5_sum + av_md5_update + av_memcpy_backptr + av_memdup + av_mul_q + av_murmur3_alloc + av_murmur3_final + av_murmur3_init + av_murmur3_init_seeded + av_murmur3_update + av_nearer_q + av_next_option + av_opt_child_class_next + av_opt_child_next + av_opt_eval_double + av_opt_eval_flags + av_opt_eval_float + av_opt_eval_int + av_opt_eval_int64 + av_opt_eval_q + av_opt_find + av_opt_find2 + av_opt_flag_is_set + av_opt_free + av_opt_freep_ranges + av_opt_get + av_opt_get_channel_layout + av_opt_get_double + av_opt_get_image_size + av_opt_get_int + av_opt_get_key_value + av_opt_get_pixel_fmt + av_opt_get_q + av_opt_get_sample_fmt + av_opt_get_video_rate + av_opt_next + av_opt_ptr + av_opt_query_ranges + av_opt_query_ranges_default + av_opt_set + av_opt_set_bin + av_opt_set_channel_layout + av_opt_set_defaults + av_opt_set_defaults2 + av_opt_set_dict + av_opt_set_double + av_opt_set_from_string + av_opt_set_image_size + av_opt_set_int + av_opt_set_pixel_fmt + av_opt_set_q + av_opt_set_sample_fmt + av_opt_set_video_rate + av_opt_show2 + av_parse_color + av_parse_cpu_caps + av_parse_cpu_flags + av_parse_ratio + av_parse_time + av_parse_video_rate + av_parse_video_size + av_pix_fmt_count_planes + av_pix_fmt_desc_get + av_pix_fmt_desc_get_id + av_pix_fmt_desc_next + av_pix_fmt_descriptors DATA + av_pix_fmt_get_chroma_sub_sample + av_pix_fmt_swap_endianness + av_rc4_crypt + av_rc4_init + av_read_image_line + av_realloc + av_realloc_array + av_realloc_f + av_reallocp + av_reallocp_array + av_reduce + av_rescale + av_rescale_delta + av_rescale_q + av_rescale_q_rnd + av_rescale_rnd + av_reverse DATA + av_ripemd_alloc + av_ripemd_final + av_ripemd_init + av_ripemd_size DATA + av_ripemd_update + av_sample_fmt_is_planar + av_samples_alloc + av_samples_alloc_array_and_samples + av_samples_copy + av_samples_fill_arrays + av_samples_get_buffer_size + av_samples_set_silence + av_set_cpu_flags_mask + av_set_double + av_set_int + av_set_options_string + av_set_q + av_set_string3 + av_sha512_alloc + av_sha512_final + av_sha512_init + av_sha512_size DATA + av_sha512_update + av_sha_alloc + av_sha_final + av_sha_init + av_sha_size DATA + av_sha_update + av_small_strptime + av_solve_lls + av_strcasecmp + av_strdup + av_strerror + av_stristart + av_stristr + av_strlcat + av_strlcatf + av_strlcpy + av_strncasecmp + av_strnstr + av_strstart + av_strtod + av_strtok + av_sub_q + av_tempfile + av_timecode_adjust_ntsc_framenum2 + av_timecode_check_frame_rate + av_timecode_get_smpte_from_framenum + av_timecode_init + av_timecode_init_from_string + av_timecode_make_mpeg_tc_string + av_timecode_make_smpte_tc_string + av_timecode_make_string + av_timegm + av_tree_destroy + av_tree_enumerate + av_tree_find + av_tree_insert + av_tree_node_alloc + av_tree_node_size DATA + av_update_lls + av_usleep + av_vbprintf + av_vlog + av_write_image_line + av_xtea_crypt + av_xtea_init + avpriv_cga_font DATA + avpriv_emms_yasm DATA + avpriv_evaluate_lls + avpriv_float_dsp_init + avpriv_frame_get_metadatap + avpriv_init_lls + avpriv_init_lls2 + avpriv_open + avpriv_report_missing_feature + avpriv_request_sample + avpriv_scalarproduct_float_c + avpriv_set_systematic_pal2 + avpriv_solve_lls + avpriv_solve_lls2 + avpriv_update_lls + avpriv_vga16_font DATA + avutil_configuration + avutil_license + avutil_version + ff_butterflies_float_sse DATA + ff_check_pixfmt_descriptors + ff_cpu_cpuid DATA + ff_cpu_xgetbv DATA + ff_evaluate_lls_sse2 DATA + ff_float_dsp_init_x86 + ff_get_channel_layout + ff_get_cpu_flags_x86 + ff_init_lls_x86 + ff_log2_tab DATA + ff_scalarproduct_float_sse DATA + ff_update_lls_avx DATA + ff_update_lls_sse2 DATA + ff_vector_dmul_scalar_avx DATA + ff_vector_dmul_scalar_sse2 DATA + ff_vector_fmac_scalar_avx DATA + ff_vector_fmac_scalar_sse DATA + ff_vector_fmul_add_avx DATA + ff_vector_fmul_add_sse DATA + ff_vector_fmul_avx DATA + ff_vector_fmul_reverse_avx DATA + ff_vector_fmul_reverse_sse DATA + ff_vector_fmul_scalar_sse DATA + ff_vector_fmul_sse DATA diff --git a/extern/ffmpeg/x64/lib/avutil.lib b/extern/ffmpeg/x64/lib/avutil.lib new file mode 100644 index 0000000000..49f694ab7f Binary files /dev/null and b/extern/ffmpeg/x64/lib/avutil.lib differ diff --git a/extern/ffmpeg/x64/lib/libavcodec.dll.a b/extern/ffmpeg/x64/lib/libavcodec.dll.a new file mode 100644 index 0000000000..492bf7a74b Binary files /dev/null and b/extern/ffmpeg/x64/lib/libavcodec.dll.a differ diff --git a/extern/ffmpeg/x64/lib/libavdevice.dll.a b/extern/ffmpeg/x64/lib/libavdevice.dll.a new file mode 100644 index 0000000000..774224d52b Binary files /dev/null and b/extern/ffmpeg/x64/lib/libavdevice.dll.a differ diff --git a/extern/ffmpeg/x64/lib/libavfilter.dll.a b/extern/ffmpeg/x64/lib/libavfilter.dll.a new file mode 100644 index 0000000000..a355177a97 Binary files /dev/null and b/extern/ffmpeg/x64/lib/libavfilter.dll.a differ diff --git a/extern/ffmpeg/x64/lib/libavformat.dll.a b/extern/ffmpeg/x64/lib/libavformat.dll.a new file mode 100644 index 0000000000..01a6d29017 Binary files /dev/null and b/extern/ffmpeg/x64/lib/libavformat.dll.a differ diff --git a/extern/ffmpeg/x64/lib/libavutil.dll.a b/extern/ffmpeg/x64/lib/libavutil.dll.a new file mode 100644 index 0000000000..5f913f6108 Binary files /dev/null and b/extern/ffmpeg/x64/lib/libavutil.dll.a differ diff --git a/extern/ffmpeg/x64/lib/libpostproc.dll.a b/extern/ffmpeg/x64/lib/libpostproc.dll.a new file mode 100644 index 0000000000..31d988eece Binary files /dev/null and b/extern/ffmpeg/x64/lib/libpostproc.dll.a differ diff --git a/extern/ffmpeg/x64/lib/libswresample.dll.a b/extern/ffmpeg/x64/lib/libswresample.dll.a new file mode 100644 index 0000000000..867b8e2130 Binary files /dev/null and b/extern/ffmpeg/x64/lib/libswresample.dll.a differ diff --git a/extern/ffmpeg/x64/lib/libswscale.dll.a b/extern/ffmpeg/x64/lib/libswscale.dll.a new file mode 100644 index 0000000000..367d6d0e69 Binary files /dev/null and b/extern/ffmpeg/x64/lib/libswscale.dll.a differ diff --git a/extern/ffmpeg/lib/postproc-52.def b/extern/ffmpeg/x64/lib/postproc-52.def similarity index 100% rename from extern/ffmpeg/lib/postproc-52.def rename to extern/ffmpeg/x64/lib/postproc-52.def diff --git a/extern/ffmpeg/x64/lib/postproc.lib b/extern/ffmpeg/x64/lib/postproc.lib new file mode 100644 index 0000000000..b2d51f5a65 Binary files /dev/null and b/extern/ffmpeg/x64/lib/postproc.lib differ diff --git a/extern/ffmpeg/lib/swresample-0.def b/extern/ffmpeg/x64/lib/swresample-0.def similarity index 100% rename from extern/ffmpeg/lib/swresample-0.def rename to extern/ffmpeg/x64/lib/swresample-0.def diff --git a/extern/ffmpeg/x64/lib/swresample.lib b/extern/ffmpeg/x64/lib/swresample.lib new file mode 100644 index 0000000000..9b5ddd9972 Binary files /dev/null and b/extern/ffmpeg/x64/lib/swresample.lib differ diff --git a/extern/ffmpeg/lib/swscale-2.def b/extern/ffmpeg/x64/lib/swscale-2.def similarity index 100% rename from extern/ffmpeg/lib/swscale-2.def rename to extern/ffmpeg/x64/lib/swscale-2.def diff --git a/extern/ffmpeg/x64/lib/swscale.lib b/extern/ffmpeg/x64/lib/swscale.lib new file mode 100644 index 0000000000..461823911e Binary files /dev/null and b/extern/ffmpeg/x64/lib/swscale.lib differ diff --git a/Program/avcodec-55.dll b/extern/ffmpeg/x86/bin/avcodec-55.dll similarity index 100% rename from Program/avcodec-55.dll rename to extern/ffmpeg/x86/bin/avcodec-55.dll diff --git a/Program/avformat-55.dll b/extern/ffmpeg/x86/bin/avformat-55.dll similarity index 100% rename from Program/avformat-55.dll rename to extern/ffmpeg/x86/bin/avformat-55.dll diff --git a/Program/avutil-52.dll b/extern/ffmpeg/x86/bin/avutil-52.dll similarity index 100% rename from Program/avutil-52.dll rename to extern/ffmpeg/x86/bin/avutil-52.dll diff --git a/Program/swscale-2.dll b/extern/ffmpeg/x86/bin/swscale-2.dll similarity index 100% rename from Program/swscale-2.dll rename to extern/ffmpeg/x86/bin/swscale-2.dll diff --git a/extern/ffmpeg/lib/avcodec-55.def b/extern/ffmpeg/x86/lib/avcodec-55.def similarity index 100% rename from extern/ffmpeg/lib/avcodec-55.def rename to extern/ffmpeg/x86/lib/avcodec-55.def diff --git a/extern/ffmpeg/lib/avcodec.lib b/extern/ffmpeg/x86/lib/avcodec.lib similarity index 100% rename from extern/ffmpeg/lib/avcodec.lib rename to extern/ffmpeg/x86/lib/avcodec.lib diff --git a/extern/ffmpeg/x86/lib/avdevice-55.def b/extern/ffmpeg/x86/lib/avdevice-55.def new file mode 100644 index 0000000000..7fa3953f0b --- /dev/null +++ b/extern/ffmpeg/x86/lib/avdevice-55.def @@ -0,0 +1,5 @@ +EXPORTS + avdevice_configuration + avdevice_license + avdevice_register_all + avdevice_version diff --git a/extern/ffmpeg/lib/avdevice.lib b/extern/ffmpeg/x86/lib/avdevice.lib similarity index 100% rename from extern/ffmpeg/lib/avdevice.lib rename to extern/ffmpeg/x86/lib/avdevice.lib diff --git a/extern/ffmpeg/x86/lib/avfilter-3.def b/extern/ffmpeg/x86/lib/avfilter-3.def new file mode 100644 index 0000000000..63e0823e13 --- /dev/null +++ b/extern/ffmpeg/x86/lib/avfilter-3.def @@ -0,0 +1,261 @@ +EXPORTS + av_2_vs_pixel_format + av_abuffersink_params_alloc + av_buffersink_get_buffer_ref + av_buffersink_get_frame + av_buffersink_get_frame_flags + av_buffersink_get_frame_rate + av_buffersink_get_samples + av_buffersink_params_alloc + av_buffersink_poll_frame + av_buffersink_read + av_buffersink_read_samples + av_buffersink_set_frame_size + av_buffersrc_add_frame + av_buffersrc_add_frame_flags + av_buffersrc_add_ref + av_buffersrc_buffer + av_buffersrc_get_nb_failed_requests + av_buffersrc_write_frame + av_filter_next + avfilter_add_matrix + avfilter_af_aconvert DATA + avfilter_af_adelay DATA + avfilter_af_aecho DATA + avfilter_af_afade DATA + avfilter_af_afifo DATA + avfilter_af_aformat DATA + avfilter_af_ainterleave DATA + avfilter_af_allpass DATA + avfilter_af_amerge DATA + avfilter_af_amix DATA + avfilter_af_anull DATA + avfilter_af_apad DATA + avfilter_af_aperms DATA + avfilter_af_aphaser DATA + avfilter_af_aresample DATA + avfilter_af_aselect DATA + avfilter_af_asendcmd DATA + avfilter_af_asetnsamples DATA + avfilter_af_asetpts DATA + avfilter_af_asetrate DATA + avfilter_af_asettb DATA + avfilter_af_ashowinfo DATA + avfilter_af_asplit DATA + avfilter_af_astats DATA + avfilter_af_astreamsync DATA + avfilter_af_atempo DATA + avfilter_af_atrim DATA + avfilter_af_bandpass DATA + avfilter_af_bandreject DATA + avfilter_af_bass DATA + avfilter_af_biquad DATA + avfilter_af_channelmap DATA + avfilter_af_channelsplit DATA + avfilter_af_compand DATA + avfilter_af_earwax DATA + avfilter_af_ebur128 DATA + avfilter_af_equalizer DATA + avfilter_af_highpass DATA + avfilter_af_join DATA + avfilter_af_lowpass DATA + avfilter_af_pan DATA + avfilter_af_replaygain DATA + avfilter_af_silencedetect DATA + avfilter_af_treble DATA + avfilter_af_volume DATA + avfilter_af_volumedetect DATA + avfilter_all_channel_layouts DATA + avfilter_asink_abuffer DATA + avfilter_asink_anullsink DATA + avfilter_asink_ffabuffersink DATA + avfilter_asrc_abuffer DATA + avfilter_asrc_aevalsrc DATA + avfilter_asrc_anullsrc DATA + avfilter_asrc_sine DATA + avfilter_avf_avectorscope DATA + avfilter_avf_concat DATA + avfilter_avf_showspectrum DATA + avfilter_avf_showwaves DATA + avfilter_avsrc_amovie DATA + avfilter_avsrc_movie DATA + avfilter_config_links + avfilter_configuration + avfilter_copy_buf_props + avfilter_copy_buffer_ref_props + avfilter_copy_frame_props + avfilter_fill_frame_from_audio_buffer_ref + avfilter_fill_frame_from_buffer_ref + avfilter_fill_frame_from_video_buffer_ref + avfilter_free + avfilter_get_audio_buffer_ref_from_arrays + avfilter_get_audio_buffer_ref_from_arrays_channels + avfilter_get_audio_buffer_ref_from_frame + avfilter_get_buffer_ref_from_frame + avfilter_get_by_name + avfilter_get_class + avfilter_get_matrix + avfilter_get_video_buffer_ref_from_arrays + avfilter_get_video_buffer_ref_from_frame + avfilter_graph_add_filter + avfilter_graph_alloc + avfilter_graph_alloc_filter + avfilter_graph_config + avfilter_graph_create_filter + avfilter_graph_dump + avfilter_graph_free + avfilter_graph_get_filter + avfilter_graph_parse + avfilter_graph_parse2 + avfilter_graph_parse_ptr + avfilter_graph_queue_command + avfilter_graph_request_oldest + avfilter_graph_send_command + avfilter_graph_set_auto_convert + avfilter_init_dict + avfilter_init_filter + avfilter_init_str + avfilter_inout_alloc + avfilter_inout_free + avfilter_insert_filter + avfilter_license + avfilter_link + avfilter_link_free + avfilter_link_get_channels + avfilter_link_set_closed + avfilter_make_format64_list + avfilter_mul_matrix + avfilter_next + avfilter_open + avfilter_pad_count + avfilter_pad_get_name + avfilter_pad_get_type + avfilter_process_command + avfilter_ref_buffer + avfilter_ref_get_channels + avfilter_register + avfilter_register_all + avfilter_sub_matrix + avfilter_transform + avfilter_uninit + avfilter_unref_buffer + avfilter_unref_bufferp + avfilter_version + avfilter_vf_alphaextract DATA + avfilter_vf_alphamerge DATA + avfilter_vf_ass DATA + avfilter_vf_bbox DATA + avfilter_vf_blackdetect DATA + avfilter_vf_blackframe DATA + avfilter_vf_blend DATA + avfilter_vf_boxblur DATA + avfilter_vf_colorbalance DATA + avfilter_vf_colorchannelmixer DATA + avfilter_vf_colormatrix DATA + avfilter_vf_copy DATA + avfilter_vf_crop DATA + avfilter_vf_cropdetect DATA + avfilter_vf_curves DATA + avfilter_vf_dctdnoiz DATA + avfilter_vf_decimate DATA + avfilter_vf_delogo DATA + avfilter_vf_deshake DATA + avfilter_vf_drawbox DATA + avfilter_vf_drawgrid DATA + avfilter_vf_drawtext DATA + avfilter_vf_edgedetect DATA + avfilter_vf_extractplanes DATA + avfilter_vf_fade DATA + avfilter_vf_field DATA + avfilter_vf_fieldmatch DATA + avfilter_vf_fieldorder DATA + avfilter_vf_fifo DATA + avfilter_vf_format DATA + avfilter_vf_fps DATA + avfilter_vf_framestep DATA + avfilter_vf_frei0r DATA + avfilter_vf_geq DATA + avfilter_vf_gradfun DATA + avfilter_vf_haldclut DATA + avfilter_vf_hflip DATA + avfilter_vf_histeq DATA + avfilter_vf_histogram DATA + avfilter_vf_hqdn3d DATA + avfilter_vf_hue DATA + avfilter_vf_idet DATA + avfilter_vf_il DATA + avfilter_vf_interlace DATA + avfilter_vf_interleave DATA + avfilter_vf_kerndeint DATA + avfilter_vf_lut DATA + avfilter_vf_lut3d DATA + avfilter_vf_lutrgb DATA + avfilter_vf_lutyuv DATA + avfilter_vf_mcdeint DATA + avfilter_vf_mergeplanes DATA + avfilter_vf_mp DATA + avfilter_vf_mpdecimate DATA + avfilter_vf_negate DATA + avfilter_vf_noformat DATA + avfilter_vf_noise DATA + avfilter_vf_null DATA + avfilter_vf_overlay DATA + avfilter_vf_owdenoise DATA + avfilter_vf_pad DATA + avfilter_vf_perms DATA + avfilter_vf_perspective DATA + avfilter_vf_phase DATA + avfilter_vf_pixdesctest DATA + avfilter_vf_pp DATA + avfilter_vf_psnr DATA + avfilter_vf_pullup DATA + avfilter_vf_removelogo DATA + avfilter_vf_rotate DATA + avfilter_vf_sab DATA + avfilter_vf_scale DATA + avfilter_vf_select DATA + avfilter_vf_sendcmd DATA + avfilter_vf_separatefields DATA + avfilter_vf_setdar DATA + avfilter_vf_setfield DATA + avfilter_vf_setpts DATA + avfilter_vf_setsar DATA + avfilter_vf_settb DATA + avfilter_vf_showinfo DATA + avfilter_vf_smartblur DATA + avfilter_vf_split DATA + avfilter_vf_spp DATA + avfilter_vf_stereo3d DATA + avfilter_vf_subtitles DATA + avfilter_vf_super2xsai DATA + avfilter_vf_swapuv DATA + avfilter_vf_telecine DATA + avfilter_vf_thumbnail DATA + avfilter_vf_tile DATA + avfilter_vf_tinterlace DATA + avfilter_vf_transpose DATA + avfilter_vf_trim DATA + avfilter_vf_unsharp DATA + avfilter_vf_vflip DATA + avfilter_vf_vidstabdetect DATA + avfilter_vf_vidstabtransform DATA + avfilter_vf_vignette DATA + avfilter_vf_w3fdif DATA + avfilter_vf_yadif DATA + avfilter_vsink_buffer DATA + avfilter_vsink_ffbuffersink DATA + avfilter_vsink_nullsink DATA + avfilter_vsrc_buffer DATA + avfilter_vsrc_cellauto DATA + avfilter_vsrc_color DATA + avfilter_vsrc_frei0r_src DATA + avfilter_vsrc_haldclutsrc DATA + avfilter_vsrc_life DATA + avfilter_vsrc_mandelbrot DATA + avfilter_vsrc_mptestsrc DATA + avfilter_vsrc_nullsrc DATA + avfilter_vsrc_rgbtestsrc DATA + avfilter_vsrc_smptebars DATA + avfilter_vsrc_smptehdbars DATA + avfilter_vsrc_testsrc DATA + ff_default_query_formats diff --git a/extern/ffmpeg/lib/avfilter.lib b/extern/ffmpeg/x86/lib/avfilter.lib similarity index 100% rename from extern/ffmpeg/lib/avfilter.lib rename to extern/ffmpeg/x86/lib/avfilter.lib diff --git a/extern/ffmpeg/x86/lib/avformat-55.def b/extern/ffmpeg/x86/lib/avformat-55.def new file mode 100644 index 0000000000..da8f81ee66 --- /dev/null +++ b/extern/ffmpeg/x86/lib/avformat-55.def @@ -0,0 +1,152 @@ +EXPORTS + av_add_index_entry + av_append_packet + av_close_input_file + av_codec_get_id + av_codec_get_tag + av_codec_get_tag2 + av_convert_lang_to + av_demuxer_open + av_dump_format + av_filename_number_test + av_find_best_stream + av_find_default_stream_index + av_find_input_format + av_find_program_from_stream + av_find_stream_info + av_fmt_ctx_get_duration_estimation_method + av_format_get_audio_codec + av_format_get_probe_score + av_format_get_subtitle_codec + av_format_get_video_codec + av_format_set_audio_codec + av_format_set_subtitle_codec + av_format_set_video_codec + av_get_frame_filename + av_get_output_timestamp + av_get_packet + av_guess_codec + av_guess_format + av_guess_frame_rate + av_guess_sample_aspect_ratio + av_hex_dump + av_hex_dump_log + av_iformat_next + av_index_search_timestamp + av_interleaved_write_frame + av_match_ext + av_new_program + av_new_stream + av_oformat_next + av_pkt_dump2 + av_pkt_dump_log2 + av_probe_input_buffer + av_probe_input_buffer2 + av_probe_input_format + av_probe_input_format2 + av_probe_input_format3 + av_read_frame + av_read_packet + av_read_pause + av_read_play + av_register_all + av_register_input_format + av_register_output_format + av_register_rdt_dynamic_payload_handlers + av_register_rtp_dynamic_payload_handlers + av_sdp_create + av_seek_frame + av_set_pts_info + av_stream_get_r_frame_rate + av_stream_set_r_frame_rate + av_url_split + av_write_frame + av_write_trailer + avformat_alloc_context + avformat_alloc_output_context + avformat_alloc_output_context2 + avformat_close_input + avformat_configuration + avformat_find_stream_info + avformat_free_context + avformat_get_class + avformat_get_riff_audio_tags + avformat_get_riff_video_tags + avformat_license + avformat_match_stream_specifier + avformat_network_deinit + avformat_network_init + avformat_new_stream + avformat_open_input + avformat_query_codec + avformat_queue_attached_pictures + avformat_seek_file + avformat_version + avformat_write_header + avio_alloc_context + avio_check + avio_close + avio_close_dyn_buf + avio_closep + avio_enum_protocols + avio_flush + avio_get_str + avio_get_str16be + avio_get_str16le + avio_open + avio_open2 + avio_open_dyn_buf + avio_pause + avio_printf + avio_put_str + avio_put_str16le + avio_r8 + avio_rb16 + avio_rb24 + avio_rb32 + avio_rb64 + avio_read + avio_rl16 + avio_rl24 + avio_rl32 + avio_rl64 + avio_seek + avio_seek_time + avio_size + avio_skip + avio_w8 + avio_wb16 + avio_wb24 + avio_wb32 + avio_wb64 + avio_wl16 + avio_wl24 + avio_wl32 + avio_wl64 + avio_write + avpriv_dv_get_packet + avpriv_dv_init_demux + avpriv_dv_produce_packet + avpriv_new_chapter + avpriv_set_pts_info + ff_codec_get_id + ff_inet_aton + ff_mpegts_parse_close + ff_mpegts_parse_open + ff_mpegts_parse_packet + ff_rtp_get_local_rtcp_port + ff_rtp_get_local_rtp_port + ff_rtsp_parse_line + ff_socket_nonblock + ffio_open_dyn_packet_buf + ffio_set_buf_size + ffurl_close + ffurl_open + ffurl_protocol_next + ffurl_read_complete + ffurl_seek + ffurl_size + ffurl_write + get_crc_table + get_extension + url_feof diff --git a/extern/ffmpeg/lib/avformat.lib b/extern/ffmpeg/x86/lib/avformat.lib similarity index 100% rename from extern/ffmpeg/lib/avformat.lib rename to extern/ffmpeg/x86/lib/avformat.lib diff --git a/extern/ffmpeg/lib/avutil-52.def b/extern/ffmpeg/x86/lib/avutil-52.def similarity index 100% rename from extern/ffmpeg/lib/avutil-52.def rename to extern/ffmpeg/x86/lib/avutil-52.def diff --git a/extern/ffmpeg/lib/avutil.lib b/extern/ffmpeg/x86/lib/avutil.lib similarity index 100% rename from extern/ffmpeg/lib/avutil.lib rename to extern/ffmpeg/x86/lib/avutil.lib diff --git a/extern/ffmpeg/lib/libavcodec.dll.a b/extern/ffmpeg/x86/lib/libavcodec.dll.a similarity index 100% rename from extern/ffmpeg/lib/libavcodec.dll.a rename to extern/ffmpeg/x86/lib/libavcodec.dll.a diff --git a/extern/ffmpeg/lib/libavdevice.dll.a b/extern/ffmpeg/x86/lib/libavdevice.dll.a similarity index 100% rename from extern/ffmpeg/lib/libavdevice.dll.a rename to extern/ffmpeg/x86/lib/libavdevice.dll.a diff --git a/extern/ffmpeg/lib/libavfilter.dll.a b/extern/ffmpeg/x86/lib/libavfilter.dll.a similarity index 100% rename from extern/ffmpeg/lib/libavfilter.dll.a rename to extern/ffmpeg/x86/lib/libavfilter.dll.a diff --git a/extern/ffmpeg/lib/libavformat.dll.a b/extern/ffmpeg/x86/lib/libavformat.dll.a similarity index 100% rename from extern/ffmpeg/lib/libavformat.dll.a rename to extern/ffmpeg/x86/lib/libavformat.dll.a diff --git a/extern/ffmpeg/lib/libavutil.dll.a b/extern/ffmpeg/x86/lib/libavutil.dll.a similarity index 100% rename from extern/ffmpeg/lib/libavutil.dll.a rename to extern/ffmpeg/x86/lib/libavutil.dll.a diff --git a/extern/ffmpeg/lib/libpostproc.dll.a b/extern/ffmpeg/x86/lib/libpostproc.dll.a similarity index 100% rename from extern/ffmpeg/lib/libpostproc.dll.a rename to extern/ffmpeg/x86/lib/libpostproc.dll.a diff --git a/extern/ffmpeg/lib/libswresample.dll.a b/extern/ffmpeg/x86/lib/libswresample.dll.a similarity index 100% rename from extern/ffmpeg/lib/libswresample.dll.a rename to extern/ffmpeg/x86/lib/libswresample.dll.a diff --git a/extern/ffmpeg/lib/libswscale.dll.a b/extern/ffmpeg/x86/lib/libswscale.dll.a similarity index 100% rename from extern/ffmpeg/lib/libswscale.dll.a rename to extern/ffmpeg/x86/lib/libswscale.dll.a diff --git a/extern/ffmpeg/x86/lib/postproc-52.def b/extern/ffmpeg/x86/lib/postproc-52.def new file mode 100644 index 0000000000..4d8bbb4b3e --- /dev/null +++ b/extern/ffmpeg/x86/lib/postproc-52.def @@ -0,0 +1,10 @@ +EXPORTS + postproc_configuration + postproc_license + postproc_version + pp_free_context + pp_free_mode + pp_get_context + pp_get_mode_by_name_and_quality + pp_help DATA + pp_postprocess diff --git a/extern/ffmpeg/lib/postproc.lib b/extern/ffmpeg/x86/lib/postproc.lib similarity index 100% rename from extern/ffmpeg/lib/postproc.lib rename to extern/ffmpeg/x86/lib/postproc.lib diff --git a/extern/ffmpeg/x86/lib/swresample-0.def b/extern/ffmpeg/x86/lib/swresample-0.def new file mode 100644 index 0000000000..91b4c64a2e --- /dev/null +++ b/extern/ffmpeg/x86/lib/swresample-0.def @@ -0,0 +1,105 @@ +EXPORTS + ff_float_to_int16_a_sse2 DATA + ff_float_to_int16_u_sse2 DATA + ff_float_to_int32_a_sse2 DATA + ff_float_to_int32_u_sse2 DATA + ff_int16_to_float_a_sse2 DATA + ff_int16_to_float_u_sse2 DATA + ff_int16_to_int32_a_mmx DATA + ff_int16_to_int32_a_sse2 DATA + ff_int16_to_int32_u_mmx DATA + ff_int16_to_int32_u_sse2 DATA + ff_int32_to_float_a_avx DATA + ff_int32_to_float_a_sse2 DATA + ff_int32_to_float_u_avx DATA + ff_int32_to_float_u_sse2 DATA + ff_int32_to_int16_a_mmx DATA + ff_int32_to_int16_a_sse2 DATA + ff_int32_to_int16_u_mmx DATA + ff_int32_to_int16_u_sse2 DATA + ff_log2_tab DATA + ff_mix_1_1_a_float_avx DATA + ff_mix_1_1_a_float_sse DATA + ff_mix_1_1_a_int16_mmx DATA + ff_mix_1_1_a_int16_sse2 DATA + ff_mix_1_1_u_float_avx DATA + ff_mix_1_1_u_float_sse DATA + ff_mix_1_1_u_int16_mmx DATA + ff_mix_1_1_u_int16_sse2 DATA + ff_mix_2_1_a_float_avx DATA + ff_mix_2_1_a_float_sse DATA + ff_mix_2_1_a_int16_mmx DATA + ff_mix_2_1_a_int16_sse2 DATA + ff_mix_2_1_u_float_avx DATA + ff_mix_2_1_u_float_sse DATA + ff_mix_2_1_u_int16_mmx DATA + ff_mix_2_1_u_int16_sse2 DATA + ff_pack_2ch_float_to_int16_a_sse2 DATA + ff_pack_2ch_float_to_int16_u_sse2 DATA + ff_pack_2ch_float_to_int32_a_sse2 DATA + ff_pack_2ch_float_to_int32_u_sse2 DATA + ff_pack_2ch_int16_to_float_a_sse2 DATA + ff_pack_2ch_int16_to_float_u_sse2 DATA + ff_pack_2ch_int16_to_int16_a_sse2 DATA + ff_pack_2ch_int16_to_int16_u_sse2 DATA + ff_pack_2ch_int16_to_int32_a_sse2 DATA + ff_pack_2ch_int16_to_int32_u_sse2 DATA + ff_pack_2ch_int32_to_float_a_sse2 DATA + ff_pack_2ch_int32_to_float_u_sse2 DATA + ff_pack_2ch_int32_to_int16_a_sse2 DATA + ff_pack_2ch_int32_to_int16_u_sse2 DATA + ff_pack_2ch_int32_to_int32_a_sse2 DATA + ff_pack_2ch_int32_to_int32_u_sse2 DATA + ff_pack_6ch_float_to_float_a_avx DATA + ff_pack_6ch_float_to_float_a_mmx DATA + ff_pack_6ch_float_to_float_a_sse4 DATA + ff_pack_6ch_float_to_float_u_avx DATA + ff_pack_6ch_float_to_float_u_mmx DATA + ff_pack_6ch_float_to_float_u_sse4 DATA + ff_pack_6ch_float_to_int32_a_avx DATA + ff_pack_6ch_float_to_int32_a_sse4 DATA + ff_pack_6ch_float_to_int32_u_avx DATA + ff_pack_6ch_float_to_int32_u_sse4 DATA + ff_pack_6ch_int32_to_float_a_avx DATA + ff_pack_6ch_int32_to_float_a_sse4 DATA + ff_pack_6ch_int32_to_float_u_avx DATA + ff_pack_6ch_int32_to_float_u_sse4 DATA + ff_resample_int16_rounder DATA + ff_unpack_2ch_float_to_int16_a_sse2 DATA + ff_unpack_2ch_float_to_int16_u_sse2 DATA + ff_unpack_2ch_float_to_int32_a_sse2 DATA + ff_unpack_2ch_float_to_int32_u_sse2 DATA + ff_unpack_2ch_int16_to_float_a_sse2 DATA + ff_unpack_2ch_int16_to_float_a_ssse3 DATA + ff_unpack_2ch_int16_to_float_u_sse2 DATA + ff_unpack_2ch_int16_to_float_u_ssse3 DATA + ff_unpack_2ch_int16_to_int16_a_sse2 DATA + ff_unpack_2ch_int16_to_int16_a_ssse3 DATA + ff_unpack_2ch_int16_to_int16_u_sse2 DATA + ff_unpack_2ch_int16_to_int16_u_ssse3 DATA + ff_unpack_2ch_int16_to_int32_a_sse2 DATA + ff_unpack_2ch_int16_to_int32_a_ssse3 DATA + ff_unpack_2ch_int16_to_int32_u_sse2 DATA + ff_unpack_2ch_int16_to_int32_u_ssse3 DATA + ff_unpack_2ch_int32_to_float_a_sse2 DATA + ff_unpack_2ch_int32_to_float_u_sse2 DATA + ff_unpack_2ch_int32_to_int16_a_sse2 DATA + ff_unpack_2ch_int32_to_int16_u_sse2 DATA + ff_unpack_2ch_int32_to_int32_a_sse2 DATA + ff_unpack_2ch_int32_to_int32_u_sse2 DATA + swr_alloc + swr_alloc_set_opts + swr_convert + swr_drop_output + swr_free + swr_get_class + swr_get_delay + swr_init + swr_inject_silence + swr_next_pts + swr_set_channel_mapping + swr_set_compensation + swr_set_matrix + swresample_configuration + swresample_license + swresample_version diff --git a/extern/ffmpeg/lib/swresample.lib b/extern/ffmpeg/x86/lib/swresample.lib similarity index 100% rename from extern/ffmpeg/lib/swresample.lib rename to extern/ffmpeg/x86/lib/swresample.lib diff --git a/extern/ffmpeg/x86/lib/swscale-2.def b/extern/ffmpeg/x86/lib/swscale-2.def new file mode 100644 index 0000000000..d828ee38e9 --- /dev/null +++ b/extern/ffmpeg/x86/lib/swscale-2.def @@ -0,0 +1,37 @@ +EXPORTS + sws_addVec + sws_allocVec + sws_alloc_context + sws_cloneVec + sws_context_class DATA + sws_convVec + sws_convertPalette8ToPacked24 + sws_convertPalette8ToPacked32 + sws_format_name + sws_freeContext + sws_freeFilter + sws_freeVec + sws_getCachedContext + sws_getCoefficients + sws_getColorspaceDetails + sws_getConstVec + sws_getContext + sws_getDefaultFilter + sws_getGaussianVec + sws_getIdentityVec + sws_get_class + sws_init_context + sws_isSupportedEndiannessConversion + sws_isSupportedInput + sws_isSupportedOutput + sws_normalizeVec + sws_printVec2 + sws_rgb2rgb_init + sws_scale + sws_scaleVec + sws_setColorspaceDetails + sws_shiftVec + sws_subVec + swscale_configuration + swscale_license + swscale_version diff --git a/extern/ffmpeg/lib/swscale.lib b/extern/ffmpeg/x86/lib/swscale.lib similarity index 100% rename from extern/ffmpeg/lib/swscale.lib rename to extern/ffmpeg/x86/lib/swscale.lib diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f68a758ae3..9bc3169f37 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -484,7 +484,7 @@ if(WIN32) get_filename_component(DIRECTX_LIBRARY_DIR "${DIRECTX_LIBRARIES}" DIRECTORY) sm_add_link_flag("${SM_EXE_NAME}" "/LIBPATH:\"${DIRECTX_LIBRARY_DIR}\"") - sm_add_link_flag("${SM_EXE_NAME}" "/LIBPATH:\"${SM_EXTERN_DIR}/ffmpeg/lib\"") + sm_add_link_flag("${SM_EXE_NAME}" "/LIBPATH:\"${SM_EXTERN_DIR}/ffmpeg/${SM_WIN32_ARCH}/lib\"") sm_add_link_flag("${SM_EXE_NAME}" "/LIBPATH:\"${SM_SRC_DIR}/archutils/Win32/ddk\"") sm_add_link_flag("${SM_EXE_NAME}" "/ERRORREPORT:SEND")