Revision: 57215
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57215
Author:   shadowrom
Date:     2013-06-03 04:58:46 +0000 (Mon, 03 Jun 2013)
Log Message:
-----------
VS 2012 libs maintenance:

- Fix compilation (linking) with ffmpeg and static zlib.

Modified Paths:
--------------
    trunk/lib/win64_vc11/ffmpeg/lib/avcodec-54.def
    trunk/lib/win64_vc11/ffmpeg/lib/avcodec-54.dll
    trunk/lib/win64_vc11/ffmpeg/lib/avcodec-54.lib
    trunk/lib/win64_vc11/ffmpeg/lib/avdevice-54.def
    trunk/lib/win64_vc11/ffmpeg/lib/avdevice-54.dll
    trunk/lib/win64_vc11/ffmpeg/lib/avdevice-54.lib
    trunk/lib/win64_vc11/ffmpeg/lib/avfilter-3.def
    trunk/lib/win64_vc11/ffmpeg/lib/avfilter-3.dll
    trunk/lib/win64_vc11/ffmpeg/lib/avfilter-3.lib
    trunk/lib/win64_vc11/ffmpeg/lib/avformat-54.def
    trunk/lib/win64_vc11/ffmpeg/lib/avformat-54.dll
    trunk/lib/win64_vc11/ffmpeg/lib/avformat-54.lib
    trunk/lib/win64_vc11/ffmpeg/lib/avutil-52.def
    trunk/lib/win64_vc11/ffmpeg/lib/avutil-52.dll
    trunk/lib/win64_vc11/ffmpeg/lib/avutil-52.lib
    trunk/lib/win64_vc11/ffmpeg/lib/swresample-0.def
    trunk/lib/win64_vc11/ffmpeg/lib/swresample-0.dll
    trunk/lib/win64_vc11/ffmpeg/lib/swresample-0.lib
    trunk/lib/win64_vc11/ffmpeg/lib/swscale-2.def
    trunk/lib/win64_vc11/ffmpeg/lib/swscale-2.dll
    trunk/lib/win64_vc11/ffmpeg/lib/swscale-2.lib

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

@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to