Skip to content

Commit b9a4d71

Browse files
committed
Add FFmpeg 2.1.3 Windows x64 libraries and auto copy binaries on configuration
1 parent 4f86491 commit b9a4d71

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+1289
-5
lines changed

StepmaniaCore.cmake

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -280,29 +280,44 @@ if(WIN32)
280280
set(HAS_FFMPEG TRUE)
281281
else()
282282
# FFMPEG...it can be evil.
283+
if(SIZEOF_INTPTR_T EQUAL 8)
284+
set(SM_WIN32_ARCH "x64")
285+
else()
286+
set(SM_WIN32_ARCH "x86")
287+
endif()
283288
find_library(LIB_SWSCALE
284289
NAMES "swscale"
285-
PATHS "${SM_EXTERN_DIR}/ffmpeg/lib"
290+
PATHS "${SM_EXTERN_DIR}/ffmpeg/${SM_WIN32_ARCH}/lib"
286291
NO_DEFAULT_PATH)
287292
get_filename_component(LIB_SWSCALE ${LIB_SWSCALE} NAME)
288293

289294
find_library(LIB_AVCODEC
290295
NAMES "avcodec"
291-
PATHS "${SM_EXTERN_DIR}/ffmpeg/lib"
296+
PATHS "${SM_EXTERN_DIR}/ffmpeg/${SM_WIN32_ARCH}/lib"
292297
NO_DEFAULT_PATH)
293298
get_filename_component(LIB_AVCODEC ${LIB_AVCODEC} NAME)
294299

295300
find_library(LIB_AVFORMAT
296301
NAMES "avformat"
297-
PATHS "${SM_EXTERN_DIR}/ffmpeg/lib"
302+
PATHS "${SM_EXTERN_DIR}/ffmpeg/${SM_WIN32_ARCH}/lib"
298303
NO_DEFAULT_PATH)
299304
get_filename_component(LIB_AVFORMAT ${LIB_AVFORMAT} NAME)
300305

301306
find_library(LIB_AVUTIL
302307
NAMES "avutil"
303-
PATHS "${SM_EXTERN_DIR}/ffmpeg/lib"
308+
PATHS "${SM_EXTERN_DIR}/ffmpeg/${SM_WIN32_ARCH}/lib"
304309
NO_DEFAULT_PATH)
305310
get_filename_component(LIB_AVUTIL ${LIB_AVUTIL} NAME)
311+
312+
list(APPEND SM_FFMPEG_WIN32_DLLS
313+
"${SM_EXTERN_DIR}/ffmpeg/${SM_WIN32_ARCH}/bin/avcodec-55.dll"
314+
"${SM_EXTERN_DIR}/ffmpeg/${SM_WIN32_ARCH}/bin/avformat-55.dll"
315+
"${SM_EXTERN_DIR}/ffmpeg/${SM_WIN32_ARCH}/bin/avutil-52.dll"
316+
"${SM_EXTERN_DIR}/ffmpeg/${SM_WIN32_ARCH}/bin/swscale-2.dll"
317+
)
318+
foreach(dll ${SM_FFMPEG_WIN32_DLLS})
319+
file(COPY "${dll}" DESTINATION "${SM_PROGRAM_DIR}/")
320+
endforeach()
306321
endif()
307322
elseif(MACOSX)
308323
if(WITH_FFMPEG AND NOT WITH_SYSTEM_FFMPEG)

extern/ffmpeg/x64/bin/avcodec-55.dll

17 MB
Binary file not shown.

extern/ffmpeg/x64/bin/avformat-55.dll

5.17 MB
Binary file not shown.

extern/ffmpeg/x64/bin/avutil-52.dll

382 KB
Binary file not shown.

extern/ffmpeg/x64/bin/swscale-2.dll

376 KB
Binary file not shown.

extern/ffmpeg/x64/lib/avcodec-55.def

Lines changed: 281 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,281 @@
1+
EXPORTS
2+
audio_resample
3+
audio_resample_close
4+
av_audio_convert
5+
av_audio_convert_alloc
6+
av_audio_convert_free
7+
av_audio_resample_init
8+
av_bitstream_filter_close
9+
av_bitstream_filter_filter
10+
av_bitstream_filter_init
11+
av_bitstream_filter_next
12+
av_codec_get_codec_descriptor
13+
av_codec_get_lowres
14+
av_codec_get_max_lowres
15+
av_codec_get_pkt_timebase
16+
av_codec_get_seek_preroll
17+
av_codec_is_decoder
18+
av_codec_is_encoder
19+
av_codec_next
20+
av_codec_set_codec_descriptor
21+
av_codec_set_lowres
22+
av_codec_set_pkt_timebase
23+
av_codec_set_seek_preroll
24+
av_copy_packet
25+
av_copy_packet_side_data
26+
av_dct_calc
27+
av_dct_end
28+
av_dct_init
29+
av_destruct_packet
30+
av_dup_packet
31+
av_fast_malloc
32+
av_fast_padded_malloc
33+
av_fast_padded_mallocz
34+
av_fast_realloc
35+
av_fft_calc
36+
av_fft_end
37+
av_fft_init
38+
av_fft_permute
39+
av_free_packet
40+
av_get_audio_frame_duration
41+
av_get_bits_per_sample
42+
av_get_codec_tag_string
43+
av_get_exact_bits_per_sample
44+
av_get_pcm_codec
45+
av_get_profile_name
46+
av_grow_packet
47+
av_hwaccel_next
48+
av_imdct_calc
49+
av_imdct_half
50+
av_init_packet
51+
av_lockmgr_register
52+
av_log_ask_for_sample
53+
av_log_missing_feature
54+
av_mdct_calc
55+
av_mdct_end
56+
av_mdct_init
57+
av_new_packet
58+
av_packet_copy_props
59+
av_packet_free_side_data
60+
av_packet_from_data
61+
av_packet_get_side_data
62+
av_packet_merge_side_data
63+
av_packet_move_ref
64+
av_packet_new_side_data
65+
av_packet_ref
66+
av_packet_shrink_side_data
67+
av_packet_split_side_data
68+
av_packet_unref
69+
av_parser_change
70+
av_parser_close
71+
av_parser_init
72+
av_parser_next
73+
av_parser_parse2
74+
av_picture_copy
75+
av_picture_crop
76+
av_picture_pad
77+
av_rdft_calc
78+
av_rdft_end
79+
av_rdft_init
80+
av_register_bitstream_filter
81+
av_register_codec_parser
82+
av_register_hwaccel
83+
av_resample
84+
av_resample_close
85+
av_resample_compensate
86+
av_resample_init
87+
av_shrink_packet
88+
av_xiphlacing
89+
available_bits
90+
avcodec_align_dimensions
91+
avcodec_align_dimensions2
92+
avcodec_alloc_context3
93+
avcodec_alloc_frame
94+
avcodec_chroma_pos_to_enum
95+
avcodec_close
96+
avcodec_configuration
97+
avcodec_copy_context
98+
avcodec_decode_audio3
99+
avcodec_decode_audio4
100+
avcodec_decode_subtitle2
101+
avcodec_decode_video2
102+
avcodec_default_execute
103+
avcodec_default_execute2
104+
avcodec_default_get_buffer
105+
avcodec_default_get_buffer2
106+
avcodec_default_get_format
107+
avcodec_default_reget_buffer
108+
avcodec_default_release_buffer
109+
avcodec_descriptor_get
110+
avcodec_descriptor_get_by_name
111+
avcodec_descriptor_next
112+
avcodec_encode_audio
113+
avcodec_encode_audio2
114+
avcodec_encode_subtitle
115+
avcodec_encode_video
116+
avcodec_encode_video2
117+
avcodec_enum_to_chroma_pos
118+
avcodec_fill_audio_frame
119+
avcodec_find_best_pix_fmt2
120+
avcodec_find_best_pix_fmt_of_2
121+
avcodec_find_best_pix_fmt_of_list
122+
avcodec_find_decoder
123+
avcodec_find_decoder_by_name
124+
avcodec_find_encoder
125+
avcodec_find_encoder_by_name
126+
avcodec_flush_buffers
127+
avcodec_free_frame
128+
avcodec_get_chroma_sub_sample
129+
avcodec_get_class
130+
avcodec_get_context_defaults3
131+
avcodec_get_edge_width
132+
avcodec_get_frame_class
133+
avcodec_get_frame_defaults
134+
avcodec_get_name
135+
avcodec_get_pix_fmt_loss
136+
avcodec_get_subtitle_rect_class
137+
avcodec_get_type
138+
avcodec_is_open
139+
avcodec_license
140+
avcodec_open2
141+
avcodec_pix_fmt_to_codec_tag
142+
avcodec_register
143+
avcodec_register_all
144+
avcodec_set_dimensions
145+
avcodec_string
146+
avcodec_version
147+
aver_isf_history
148+
avpicture_alloc
149+
avpicture_deinterlace
150+
avpicture_fill
151+
avpicture_free
152+
avpicture_get_size
153+
avpicture_layout
154+
avpriv_aac_parse_header
155+
avpriv_ac3_channel_layout_tab DATA
156+
avpriv_ac3_parse_header
157+
avpriv_adx_decode_header
158+
avpriv_align_put_bits
159+
avpriv_bprint_to_extradata
160+
avpriv_color_frame
161+
avpriv_copy_bits
162+
avpriv_copy_pce_data
163+
avpriv_dca_sample_rates DATA
164+
avpriv_dirac_parse_sequence_header
165+
avpriv_dnxhd_get_frame_size
166+
avpriv_dsputil_init
167+
avpriv_dv_codec_profile
168+
avpriv_dv_frame_profile
169+
avpriv_dv_frame_profile2
170+
avpriv_find_pix_fmt
171+
avpriv_find_start_code
172+
avpriv_flac_is_extradata_valid
173+
avpriv_flac_parse_block_header
174+
avpriv_flac_parse_streaminfo
175+
avpriv_h264_has_num_reorder_frames
176+
avpriv_lock_avformat
177+
avpriv_mjpeg_bits_ac_chrominance DATA
178+
avpriv_mjpeg_bits_ac_luminance DATA
179+
avpriv_mjpeg_bits_dc_chrominance DATA
180+
avpriv_mjpeg_bits_dc_luminance DATA
181+
avpriv_mjpeg_val_ac_chrominance DATA
182+
avpriv_mjpeg_val_ac_luminance DATA
183+
avpriv_mjpeg_val_dc DATA
184+
avpriv_mpa_bitrate_tab DATA
185+
avpriv_mpa_decode_header
186+
avpriv_mpa_freq_tab DATA
187+
avpriv_mpeg4audio_get_config
188+
avpriv_mpeg4audio_sample_rates DATA
189+
avpriv_mpegaudio_decode_header
190+
avpriv_put_string
191+
avpriv_split_xiph_headers
192+
avpriv_tak_parse_streaminfo
193+
avpriv_toupper4
194+
avpriv_unlock_avformat
195+
avpriv_vorbis_parse_extradata
196+
avpriv_vorbis_parse_frame
197+
avpriv_vorbis_parse_reset
198+
avsubtitle_free
199+
dsputil_init
200+
ff_aanscales DATA
201+
ff_dct32_fixed
202+
ff_dct32_float
203+
ff_dct32_float_avx DATA
204+
ff_dct32_float_sse DATA
205+
ff_dct32_float_sse2 DATA
206+
ff_dct_common_init
207+
ff_dct_encode_init
208+
ff_dct_encode_init_x86
209+
ff_dct_end
210+
ff_dct_init
211+
ff_dct_init_x86
212+
ff_dct_quantize_c
213+
ff_dnxhd_cid_table DATA
214+
ff_dnxhd_get_cid_table
215+
ff_dsputil_init
216+
ff_faandct
217+
ff_faandct248
218+
ff_faanidct
219+
ff_faanidct_add
220+
ff_faanidct_put
221+
ff_fdct248_islow_10
222+
ff_fdct248_islow_8
223+
ff_fdct_ifast
224+
ff_fdct_ifast248
225+
ff_fdct_mmx
226+
ff_fdct_mmxext
227+
ff_fdct_sse2
228+
ff_fft_calc_avx DATA
229+
ff_fft_calc_sse DATA
230+
ff_fft_end
231+
ff_fft_end_fixed
232+
ff_fft_end_fixed_32
233+
ff_fft_init
234+
ff_fft_init_fixed
235+
ff_fft_init_fixed_32
236+
ff_fft_init_x86
237+
ff_fft_lut_init
238+
ff_fft_permute_sse DATA
239+
ff_idct_xvid_mmx
240+
ff_idct_xvid_mmx_add
241+
ff_idct_xvid_mmx_put
242+
ff_idct_xvid_mmxext
243+
ff_idct_xvid_mmxext_add
244+
ff_idct_xvid_mmxext_put
245+
ff_idct_xvid_sse2
246+
ff_idct_xvid_sse2_add
247+
ff_idct_xvid_sse2_put
248+
ff_jpeg_fdct_islow_10
249+
ff_jpeg_fdct_islow_8
250+
ff_mdct_calc_c
251+
ff_mdct_calc_c_fixed
252+
ff_mdct_calc_c_fixed_32
253+
ff_mdct_calcw_c
254+
ff_mdct_end
255+
ff_mdct_end_fixed
256+
ff_mdct_end_fixed_32
257+
ff_mdct_init
258+
ff_mdct_init_fixed
259+
ff_mdct_init_fixed_32
260+
ff_mdct_win_fixed DATA
261+
ff_mdct_win_float DATA
262+
ff_prores_idct_put_10_sse2 DATA
263+
ff_raw_pix_fmt_tags DATA
264+
ff_rdft_end
265+
ff_rdft_init
266+
ff_simple_idct248_put
267+
ff_simple_idct44_add
268+
ff_simple_idct48_add
269+
ff_simple_idct84_add
270+
ff_simple_idct_10
271+
ff_simple_idct_12
272+
ff_simple_idct_8
273+
ff_simple_idct_add_10
274+
ff_simple_idct_add_12
275+
ff_simple_idct_add_8
276+
ff_simple_idct_add_mmx
277+
ff_simple_idct_mmx
278+
ff_simple_idct_put_10
279+
ff_simple_idct_put_12
280+
ff_simple_idct_put_8
281+
ff_simple_idct_put_mmx

extern/ffmpeg/x64/lib/avcodec.lib

210 KB
Binary file not shown.

extern/ffmpeg/x64/lib/avdevice.lib

4.49 KB
Binary file not shown.

0 commit comments

Comments
 (0)