[WRAPPER] Reverted previus commit

2 files changed, 0 insertions, 527 deletions

diff --git a/src/wrapped/wrappedlibavutil56.c b/src/wrapped/wrappedlibavutil56.c
index eb1cf389..1efec99c 100644
--- a/src/wrapped/wrappedlibavutil56.c
+++ b/src/wrapped/wrappedlibavutil56.c
@@ -1,16 +1,9 @@
-<<<<<<< Updated upstream
-=======
-#include <stdio.h>
->>>>>>> Stashed changes
 #include <stdlib.h>
 #include <string.h>
 #define _GNU_SOURCE         /* See feature_test_macros(7) */
 #include <dlfcn.h>
-<<<<<<< Updated upstream
 #include <stdarg.h>
 #include <stdio.h>
-=======
->>>>>>> Stashed changes
 
 #include "wrappedlibs.h"
 
@@ -27,7 +20,6 @@
 #include "myalign.h"
 
 const char* libavutil56Name = "libavutil.so.56";
-<<<<<<< Updated upstream
 
 #define LIBNAME libavutil56
 
@@ -36,17 +28,6 @@ const char* libavutil56Name = "libavutil.so.56";
 #include "generated/wrappedlibavutil56types.h"
 
 #include "wrappercallback.h"
-=======
-#define ALTNAME "libavutil.so"
-
-#define LIBNAME libavutil56
-
-//#define ADDED_FUNCTIONS()                   \
-
-//#include "generated/wrappedlibcupstypes.h"
-
-//#include "wrappercallback.h"
->>>>>>> Stashed changes
 
 #define SUPER() \
 GO(0)   \
@@ -55,7 +36,6 @@ GO(2)   \
 GO(3)   \
 GO(4)
 
-<<<<<<< Updated upstream
 // log_callback ...
 #define GO(A)   \
 static uintptr_t my_log_callback_fct_##A = 0;                                   \
@@ -90,6 +70,4 @@ EXPORT void my_av_log_set_callback(x64emu_t* emu, void* f)
     my->av_log_set_callback(find_log_callback_Fct(f));
 }
 
-=======
->>>>>>> Stashed changes
 #include "wrappedlib_init.h"
diff --git a/src/wrapped/wrappedlibavutil56_private.h b/src/wrapped/wrappedlibavutil56_private.h
index 73335891..4e937ebd 100644
--- a/src/wrapped/wrappedlibavutil56_private.h
+++ b/src/wrapped/wrappedlibavutil56_private.h
@@ -5,7 +5,6 @@
 //GO(av_add_i, 
 //GO(av_add_q, 
 //GO(av_add_stable, 
-<<<<<<< Updated upstream
 GO(av_adler32_update, uFupL)
 GO(av_aes_alloc, pFv)
 GO(av_aes_crypt, vFpppipi)
@@ -121,130 +120,12 @@ GO(av_dirname, pFp)
 GO(av_display_matrix_flip, vFpii)
 GO(av_display_rotation_get, dFp)
 GO(av_display_rotation_set, vFpd)
-=======
-//GO(av_adler32_update, 
-//GO(av_aes_alloc, 
-//GO(av_aes_crypt, 
-//GO(av_aes_ctr_alloc, 
-//GO(av_aes_ctr_crypt, 
-//GO(av_aes_ctr_free, 
-//GO(av_aes_ctr_get_iv, 
-//GO(av_aes_ctr_increment_iv, 
-//GO(av_aes_ctr_init, 
-//GO(av_aes_ctr_set_full_iv, 
-//GO(av_aes_ctr_set_iv, 
-//GO(av_aes_ctr_set_random_iv, 
-//GO(av_aes_init, 
-//GO(av_aes_size, 
-//GO(av_append_path_component, 
-//GO(av_asprintf, 
-//GO(av_assert0_fpu, 
-//GO(av_audio_fifo_alloc, 
-//GO(av_audio_fifo_drain, 
-//GO(av_audio_fifo_free, 
-//GO(av_audio_fifo_peek, 
-//GO(av_audio_fifo_peek_at, 
-//GO(av_audio_fifo_read, 
-//GO(av_audio_fifo_realloc, 
-//GO(av_audio_fifo_reset, 
-//GO(av_audio_fifo_size, 
-//GO(av_audio_fifo_space, 
-//GO(av_audio_fifo_write, 
-//GO(av_base64_decode, 
-//GO(av_base64_encode, 
-//GO(av_basename, 
-//GO(av_blowfish_alloc, 
-//GO(av_blowfish_crypt, 
-//GO(av_blowfish_crypt_ecb, 
-//GO(av_blowfish_init, 
-//GO(av_bmg_get, 
-//GO(av_bprint_append_data, 
-//GO(av_bprint_channel_layout, 
-//GO(av_bprint_chars, 
-//GO(av_bprint_clear, 
-//GO(av_bprint_escape, 
-//GO(av_bprintf, 
-//GO(av_bprint_finalize, 
-//GO(av_bprint_get_buffer, 
-//GO(av_bprint_init, 
-//GO(av_bprint_init_for_buffer, 
-//GO(av_bprint_strftime, 
-//GO(av_buffer_alloc, 
-//GO(av_buffer_allocz, 
-//GO(av_buffer_create, 
-//GO(av_buffer_default_free, 
-//GO(av_buffer_get_opaque, 
-//GO(av_buffer_get_ref_count, 
-//GO(av_buffer_is_writable, 
-//GO(av_buffer_make_writable, 
-//GO(av_buffer_pool_buffer_get_opaque, 
-//GO(av_buffer_pool_get, 
-//GO(av_buffer_pool_init, 
-//GO(av_buffer_pool_init2, 
-//GO(av_buffer_pool_uninit, 
-//GO(av_buffer_realloc, 
-//GO(av_buffer_ref, 
-//GO(av_buffer_replace, 
-//GO(av_buffer_unref, 
-//GO(av_calloc, 
-//GO(av_camellia_alloc, 
-//GO(av_camellia_crypt, 
-//GO(av_camellia_init, 
-//GO(av_camellia_size, 
-//GO(av_cast5_alloc, 
-//GO(av_cast5_crypt, 
-//GO(av_cast5_crypt2, 
-//GO(av_cast5_init, 
-//GO(av_cast5_size, 
-//GO(av_channel_layout_extract_channel, 
-//GO(av_chroma_location_from_name, 
-//GO(av_chroma_location_name, 
-//GO(av_cmp_i, 
-//GO(av_color_primaries_from_name, 
-//GO(av_color_primaries_name, 
-//GO(av_color_range_from_name, 
-//GO(av_color_range_name, 
-//GO(av_color_space_from_name, 
-//GO(av_color_space_name, 
-//GO(av_color_transfer_from_name, 
-//GO(av_color_transfer_name, 
-//GO(av_compare_mod, 
-//GO(av_compare_ts, 
-//GO(av_content_light_metadata_alloc, 
-//GO(av_content_light_metadata_create_side_data, 
-//GO(av_cpu_count, 
-//GO(av_cpu_max_align, 
-//GO(av_crc, 
-//GO(av_crc_get_table, 
-//GO(av_crc_init, 
-//GO(av_d2q, 
-//GO(av_d2str, 
-//GO(av_default_get_category, 
-//GO(av_default_item_name, 
-//GO(av_des_alloc, 
-//GO(av_des_crypt, 
-//GO(av_des_init, 
-//GO(av_des_mac, 
-//GO(av_dict_copy, 
-//GO(av_dict_count, 
-//GO(av_dict_free, 
-//GO(av_dict_get, 
-//GO(av_dict_get_string, 
-//GO(av_dict_parse_string, 
-//GO(av_dict_set, 
-//GO(av_dict_set_int, 
-//GO(av_dirname, 
-//GO(av_display_matrix_flip, 
-//GO(av_display_rotation_get, 
-//GO(av_display_rotation_set, 
->>>>>>> Stashed changes
 //GO(av_div_i, 
 //GO(av_div_q, 
 //GO(av_dovi_alloc, 
 //GO(av_downmix_info_update_side_data, 
 //GO(av_dynamic_hdr_plus_alloc, 
 //GO(av_dynamic_hdr_plus_create_side_data, 
-<<<<<<< Updated upstream
 GO(av_dynarray2_add, pFppLp)
 GO(av_dynarray_add, vFppp)
 GO(av_dynarray_add_nofree, iFppp)
@@ -267,30 +148,6 @@ GO(av_expr_free, vFp)
 GO(av_fast_malloc, vFppL)
 GO(av_fast_mallocz, vFppL)
 GO(av_fast_realloc, pFppL)
-=======
-//GO(av_dynarray2_add, 
-//GO(av_dynarray_add, 
-//GO(av_dynarray_add_nofree, 
-//GO(av_encryption_info_add_side_data, 
-//GO(av_encryption_info_alloc, 
-//GO(av_encryption_info_clone, 
-//GO(av_encryption_info_free, 
-//GO(av_encryption_info_get_side_data, 
-//GO(av_encryption_init_info_add_side_data, 
-//GO(av_encryption_init_info_alloc, 
-//GO(av_encryption_init_info_free, 
-//GO(av_encryption_init_info_get_side_data, 
-//GO(av_escape, 
-//GO(av_expr_count_func, 
-//GO(av_expr_count_vars, 
-//GO(av_expr_eval, 
-//GO(av_expr_free, 
-//GO(av_expr_parse, 
-//GO(av_expr_parse_and_eval, 
-//GO(av_fast_malloc, 
-//GO(av_fast_mallocz, 
-//GO(av_fast_realloc, 
->>>>>>> Stashed changes
 //GO(av_fifo_alloc, 
 //GO(av_fifo_alloc_array, 
 //GO(av_fifo_drain, 
@@ -307,7 +164,6 @@ GO(av_fast_realloc, pFppL)
 //GO(av_fifo_space, 
 //GO(av_file_map, 
 //GO(av_file_unmap, 
-<<<<<<< Updated upstream
 GO(av_film_grain_params_alloc, pFp)
 GO(av_film_grain_params_create_side_data, pFp)
 GO(av_find_best_pix_fmt_of_2, iFiiiip)
@@ -324,24 +180,6 @@ GO(av_frame_copy_props, iFpp)
 GO(av_frame_free, vFp)
 //GO(av_frame_get_best_effort_timestamp, 
 GO(av_frame_get_buffer, iFpi)
-=======
-//GO(av_film_grain_params_alloc, 
-//GO(av_film_grain_params_create_side_data, 
-//GO(av_find_best_pix_fmt_of_2, 
-//GO(av_find_info_tag, 
-//GO(av_find_nearest_q_idx, 
-//GO(av_fopen_utf8, 
-//GO(av_force_cpu_flags, 
-//GO(av_fourcc_make_string, 
-//GO(av_frame_alloc, 
-//GO(av_frame_apply_cropping, 
-//GO(av_frame_clone, 
-//GO(av_frame_copy, 
-//GO(av_frame_copy_props, 
-//GO(av_frame_free, 
-//GO(av_frame_get_best_effort_timestamp, 
-//GO(av_frame_get_buffer, 
->>>>>>> Stashed changes
 //GO(av_frame_get_channel_layout, 
 //GO(av_frame_get_channels, 
 //GO(av_frame_get_color_range, 
@@ -351,7 +189,6 @@ GO(av_frame_get_buffer, iFpi)
 //GO(av_frame_get_pkt_duration, 
 //GO(av_frame_get_pkt_pos, 
 //GO(av_frame_get_pkt_size, 
-<<<<<<< Updated upstream
 GO(av_frame_get_plane_buffer, pFpi)
 //GO(av_frame_get_qp_table, 
 //GO(av_frame_get_sample_rate, 
@@ -363,19 +200,6 @@ GO(av_frame_new_side_data, pFpuL)
 GO(av_frame_new_side_data_from_buf, pFpup)
 GO(av_frame_ref, iFpp)
 GO(av_frame_remove_side_data, vFpu)
-=======
-//GO(av_frame_get_plane_buffer, 
-//GO(av_frame_get_qp_table, 
-//GO(av_frame_get_sample_rate, 
-//GO(av_frame_get_side_data, 
-//GO(av_frame_is_writable, 
-//GO(av_frame_make_writable, 
-//GO(av_frame_move_ref, 
-//GO(av_frame_new_side_data, 
-//GO(av_frame_new_side_data_from_buf, 
-//GO(av_frame_ref, 
-//GO(av_frame_remove_side_data, 
->>>>>>> Stashed changes
 //GO(av_frame_set_best_effort_timestamp, 
 //GO(av_frame_set_channel_layout, 
 //GO(av_frame_set_channels, 
@@ -388,7 +212,6 @@ GO(av_frame_remove_side_data, vFpu)
 //GO(av_frame_set_pkt_size, 
 //GO(av_frame_set_qp_table, 
 //GO(av_frame_set_sample_rate, 
-<<<<<<< Updated upstream
 GO(av_frame_side_data_name, pFu)
 GO(av_frame_unref, vFp)
 GO(av_free, vFp)
@@ -398,17 +221,6 @@ GO(av_gcd, IFII)
 GO(av_get_alt_sample_fmt, iFii)
 GO(av_get_bits_per_pixel, iFp)
 GO(av_get_bytes_per_sample, iFi)
-=======
-//GO(av_frame_side_data_name, 
-//GO(av_frame_unref, 
-//GO(av_free, 
-//GO(av_freep, 
-//GO(av_gcd, 
-//GO(av_gcd_q, 
-//GO(av_get_alt_sample_fmt, 
-//GO(av_get_bits_per_pixel, 
-//GO(av_get_bytes_per_sample, 
->>>>>>> Stashed changes
 //GO(av_get_channel_description, 
 //GO(av_get_channel_layout, 
 //GO(av_get_channel_layout_channel_index, 
@@ -416,7 +228,6 @@ GO(av_get_bytes_per_sample, iFi)
 //GO(av_get_channel_layout_string, 
 //GO(av_get_channel_name, 
 //GO(av_get_colorspace_name, 
-<<<<<<< Updated upstream
 GO(av_get_cpu_flags, iFv)
 //GO(av_get_default_channel_layout, 
 //GO(av_get_extended_channel_layout, 
@@ -602,193 +413,6 @@ GO(av_pix_fmt_get_chroma_sub_sample, iFipp)
 GO(av_pix_fmt_swap_endianness, iFi)
 //GO(avpriv_alloc_fixed_dsp, 
 //DATA(avpriv_cga_font, 
-=======
-//GO(av_get_cpu_flags, 
-//GO(av_get_default_channel_layout, 
-//GO(av_get_extended_channel_layout, 
-//GO(av_get_known_color_name, 
-//GO(av_get_media_type_string, 
-//GO(av_get_packed_sample_fmt, 
-//GO(av_get_padded_bits_per_pixel, 
-//GO(av_get_picture_type_char, 
-//GO(av_get_pix_fmt, 
-//GO(av_get_pix_fmt_loss, 
-//GO(av_get_pix_fmt_name, 
-//GO(av_get_pix_fmt_string, 
-//GO(av_get_planar_sample_fmt, 
-//GO(av_get_random_seed, 
-//GO(av_get_sample_fmt, 
-//GO(av_get_sample_fmt_name, 
-//GO(av_get_sample_fmt_string, 
-//GO(av_get_standard_channel_layout, 
-//GO(av_gettime, 
-//GO(av_get_time_base_q, 
-//GO(av_gettime_relative, 
-//GO(av_gettime_relative_is_monotonic, 
-//GO(av_get_token, 
-//GO(av_hash_alloc, 
-//GO(av_hash_final, 
-//GO(av_hash_final_b64, 
-//GO(av_hash_final_bin, 
-//GO(av_hash_final_hex, 
-//GO(av_hash_freep, 
-//GO(av_hash_get_name, 
-//GO(av_hash_get_size, 
-//GO(av_hash_init, 
-//GO(av_hash_names, 
-//GO(av_hash_update, 
-//GO(av_hmac_alloc, 
-//GO(av_hmac_calc, 
-//GO(av_hmac_final, 
-//GO(av_hmac_free, 
-//GO(av_hmac_init, 
-//GO(av_hmac_update, 
-//GO(av_hwdevice_ctx_alloc, 
-//GO(av_hwdevice_ctx_create, 
-//GO(av_hwdevice_ctx_create_derived, 
-//GO(av_hwdevice_ctx_create_derived_opts, 
-//GO(av_hwdevice_ctx_init, 
-//GO(av_hwdevice_find_type_by_name, 
-//GO(av_hwdevice_get_hwframe_constraints, 
-//GO(av_hwdevice_get_type_name, 
-//GO(av_hwdevice_hwconfig_alloc, 
-//GO(av_hwdevice_iterate_types, 
-//GO(av_hwframe_constraints_free, 
-//GO(av_hwframe_ctx_alloc, 
-//GO(av_hwframe_ctx_create_derived, 
-//GO(av_hwframe_ctx_init, 
-//GO(av_hwframe_get_buffer, 
-//GO(av_hwframe_map, 
-//GO(av_hwframe_transfer_data, 
-//GO(av_hwframe_transfer_get_formats, 
-//GO(av_i2int, 
-//GO(av_image_alloc, 
-//GO(av_image_check_sar, 
-//GO(av_image_check_size, 
-//GO(av_image_check_size2, 
-//GO(av_image_copy, 
-//GO(av_image_copy_plane, 
-//GO(av_image_copy_to_buffer, 
-//GO(av_image_copy_uc_from, 
-//GO(av_image_fill_arrays, 
-//GO(av_image_fill_black, 
-//GO(av_image_fill_linesizes, 
-//GO(av_image_fill_max_pixsteps, 
-//GO(av_image_fill_plane_sizes, 
-//GO(av_image_fill_pointers, 
-//GO(av_image_get_buffer_size, 
-//GO(av_image_get_linesize, 
-//GO(av_int2i, 
-//GO(av_int_list_length_for_size, 
-//GO(av_lfg_init, 
-//GO(av_lfg_init_from_data, 
-//GO(av_log, 
-//GO(av_log2, 
-//GO(av_log2_16bit, 
-//GO(av_log2_i, 
-//GO(av_log_default_callback, 
-//GO(av_log_format_line, 
-//GO(av_log_format_line2, 
-//GO(av_log_get_flags, 
-//GO(av_log_get_level, 
-//GO(av_log_once, 
-//GO(av_log_set_callback, 
-//GO(av_log_set_flags, 
-//GO(av_log_set_level, 
-//GO(av_lzo1x_decode, 
-//GO(av_malloc, 
-//GO(av_malloc_array, 
-//GO(av_mallocz, 
-//GO(av_mallocz_array, 
-//GO(av_mastering_display_metadata_alloc, 
-//GO(av_mastering_display_metadata_create_side_data, 
-//GO(av_match_list, 
-//GO(av_match_name, 
-//GO(av_max_alloc, 
-//GO(av_md5_alloc, 
-//GO(av_md5_final, 
-//GO(av_md5_init, 
-//GO(av_md5_size, 
-//GO(av_md5_sum, 
-//GO(av_md5_update, 
-//GO(av_memcpy_backptr, 
-//GO(av_memdup, 
-//GO(av_mod_i, 
-//GO(av_mul_i, 
-//GO(av_mul_q, 
-//GO(av_murmur3_alloc, 
-//GO(av_murmur3_final, 
-//GO(av_murmur3_init, 
-//GO(av_murmur3_init_seeded, 
-//GO(av_murmur3_update, 
-//GO(av_nearer_q, 
-//GO(av_opt_child_class_iterate, 
-//GO(av_opt_child_class_next, 
-//GO(av_opt_child_next, 
-//GO(av_opt_copy, 
-//GO(av_opt_eval_double, 
-//GO(av_opt_eval_flags, 
-//GO(av_opt_eval_float, 
-//GO(av_opt_eval_int, 
-//GO(av_opt_eval_int64, 
-//GO(av_opt_eval_q, 
-//GO(av_opt_find, 
-//GO(av_opt_find2, 
-//GO(av_opt_flag_is_set, 
-//GO(av_opt_free, 
-//GO(av_opt_freep_ranges, 
-//GO(av_opt_get, 
-//GO(av_opt_get_channel_layout, 
-//GO(av_opt_get_dict_val, 
-//GO(av_opt_get_double, 
-//GO(av_opt_get_image_size, 
-//GO(av_opt_get_int, 
-//GO(av_opt_get_key_value, 
-//GO(av_opt_get_pixel_fmt, 
-//GO(av_opt_get_q, 
-//GO(av_opt_get_sample_fmt, 
-//GO(av_opt_get_video_rate, 
-//GO(av_opt_is_set_to_default, 
-//GO(av_opt_is_set_to_default_by_name, 
-//GO(av_opt_next, 
-//GO(av_opt_ptr, 
-//GO(av_opt_query_ranges, 
-//GO(av_opt_query_ranges_default, 
-//GO(av_opt_serialize, 
-//GO(av_opt_set, 
-//GO(av_opt_set_bin, 
-//GO(av_opt_set_channel_layout, 
-//GO(av_opt_set_defaults, 
-//GO(av_opt_set_defaults2, 
-//GO(av_opt_set_dict, 
-//GO(av_opt_set_dict2, 
-//GO(av_opt_set_dict_val, 
-//GO(av_opt_set_double, 
-//GO(av_opt_set_from_string, 
-//GO(av_opt_set_image_size, 
-//GO(av_opt_set_int, 
-//GO(av_opt_set_pixel_fmt, 
-//GO(av_opt_set_q, 
-//GO(av_opt_set_sample_fmt, 
-//GO(av_opt_set_video_rate, 
-//GO(av_opt_show2, 
-//GO(av_parse_color, 
-//GO(av_parse_cpu_caps, 
-//GO(av_parse_cpu_flags, 
-//GO(av_parse_ratio, 
-//GO(av_parse_time, 
-//GO(av_parse_video_rate, 
-//GO(av_parse_video_size, 
-//GO(av_pixelutils_get_sad_fn, 
-//GO(av_pix_fmt_count_planes, 
-//GO(av_pix_fmt_desc_get, 
-//GO(av_pix_fmt_desc_get_id, 
-//GO(av_pix_fmt_desc_next, 
-//GO(av_pix_fmt_get_chroma_sub_sample, 
-//GO(av_pix_fmt_swap_endianness, 
-//GO(avpriv_alloc_fixed_dsp, 
-//GO(avpriv_cga_font, 
->>>>>>> Stashed changes
 //GO(avpriv_dict_set_timestamp, 
 //GO(avpriv_float_dsp_alloc, 
 //GO(avpriv_get_gamma_from_trc, 
@@ -804,7 +428,6 @@ GO(av_pix_fmt_swap_endianness, iFi)
 //GO(avpriv_slicethread_free, 
 //GO(avpriv_solve_lls, 
 //GO(avpriv_tempfile, 
-<<<<<<< Updated upstream
 //DATA(avpriv_vga16_font, 
 //GO(av_q2intfloat, 
 GO(av_rc4_alloc, pFv)
@@ -931,131 +554,3 @@ GO(av_xtea_crypt, vFpppipi)
 GO(av_xtea_init, vFpp)
 GO(av_xtea_le_crypt, vFpppipi)
 GO(av_xtea_le_init, vFpp)
-=======
-//GO(avpriv_vga16_font, 
-//GO(av_q2intfloat, 
-//GO(av_rc4_alloc, 
-//GO(av_rc4_crypt, 
-//GO(av_rc4_init, 
-//GO(av_read_image_line, 
-//GO(av_read_image_line2, 
-//GO(av_realloc, 
-//GO(av_realloc_array, 
-//GO(av_realloc_f, 
-//GO(av_reallocp, 
-//GO(av_reallocp_array, 
-//GO(av_reduce, 
-//GO(av_rescale, 
-//GO(av_rescale_delta, 
-//GO(av_rescale_q, 
-//GO(av_rescale_q_rnd, 
-//GO(av_rescale_rnd, 
-//GO(av_ripemd_alloc, 
-//GO(av_ripemd_final, 
-//GO(av_ripemd_init, 
-//GO(av_ripemd_size, 
-//GO(av_ripemd_update, 
-//GO(av_sample_fmt_is_planar, 
-//GO(av_samples_alloc, 
-//GO(av_samples_alloc_array_and_samples, 
-//GO(av_samples_copy, 
-//GO(av_samples_fill_arrays, 
-//GO(av_samples_get_buffer_size, 
-//GO(av_samples_set_silence, 
-//GO(av_set_cpu_flags_mask, 
-//GO(av_set_options_string, 
-//GO(av_sha512_alloc, 
-//GO(av_sha512_final, 
-//GO(av_sha512_init, 
-//GO(av_sha512_size, 
-//GO(av_sha512_update, 
-//GO(av_sha_alloc, 
-//GO(av_sha_final, 
-//GO(av_sha_init, 
-//GO(av_sha_size, 
-//GO(av_sha_update, 
-//GO(av_shr_i, 
-//GO(av_small_strptime, 
-//GO(av_spherical_alloc, 
-//GO(av_spherical_from_name, 
-//GO(av_spherical_projection_name, 
-//GO(av_spherical_tile_bounds, 
-//GO(av_sscanf, 
-//GO(av_stereo3d_alloc, 
-//GO(av_stereo3d_create_side_data, 
-//GO(av_stereo3d_from_name, 
-//GO(av_stereo3d_type_name, 
-//GO(av_strcasecmp, 
-//GO(av_strdup, 
-//GO(av_strerror, 
-//GO(av_strireplace, 
-//GO(av_stristart, 
-//GO(av_stristr, 
-//GO(av_strlcat, 
-//GO(av_strlcatf, 
-//GO(av_strlcpy, 
-//GO(av_strncasecmp, 
-//GO(av_strndup, 
-//GO(av_strnstr, 
-//GO(av_strstart, 
-//GO(av_strtod, 
-//GO(av_strtok, 
-//GO(av_sub_i, 
-//GO(av_sub_q, 
-//GO(av_tea_alloc, 
-//GO(av_tea_crypt, 
-//GO(av_tea_init, 
-//GO(av_tea_size, 
-//GO(av_tempfile, 
-//GO(av_thread_message_flush, 
-//GO(av_thread_message_queue_alloc, 
-//GO(av_thread_message_queue_free, 
-//GO(av_thread_message_queue_nb_elems, 
-//GO(av_thread_message_queue_recv, 
-//GO(av_thread_message_queue_send, 
-//GO(av_thread_message_queue_set_err_recv, 
-//GO(av_thread_message_queue_set_err_send, 
-//GO(av_thread_message_queue_set_free_func, 
-//GO(av_timecode_adjust_ntsc_framenum2, 
-//GO(av_timecode_check_frame_rate, 
-//GO(av_timecode_get_smpte, 
-//GO(av_timecode_get_smpte_from_framenum, 
-//GO(av_timecode_init, 
-//GO(av_timecode_init_from_components, 
-//GO(av_timecode_init_from_string, 
-//GO(av_timecode_make_mpeg_tc_string, 
-//GO(av_timecode_make_smpte_tc_string, 
-//GO(av_timecode_make_smpte_tc_string2, 
-//GO(av_timecode_make_string, 
-//GO(av_timegm, 
-//GO(av_tree_destroy, 
-//GO(av_tree_enumerate, 
-//GO(av_tree_find, 
-//GO(av_tree_insert, 
-//GO(av_tree_node_alloc, 
-//GO(av_tree_node_size, 
-//GO(av_twofish_alloc, 
-//GO(av_twofish_crypt, 
-//GO(av_twofish_init, 
-//GO(av_twofish_size, 
-//GO(av_tx_init, 
-//GO(av_tx_uninit, 
-//GO(av_usleep, 
-//GO(av_utf8_decode, 
-//GO(avutil_configuration, 
-//GO(av_util_ffversion, 
-//GO(avutil_license, 
-//GO(avutil_version, 
-//GO(av_vbprintf, 
-//GO(av_version_info, 
-//GO(av_video_enc_params_alloc, 
-//GO(av_video_enc_params_create_side_data, 
-//GO(av_vlog, 
-//GO(av_write_image_line, 
-//GO(av_write_image_line2, 
-//GO(av_xtea_alloc, 
-//GO(av_xtea_crypt, 
-//GO(av_xtea_init, 
-//GO(av_xtea_le_crypt, 
-//GO(av_xtea_le_init, 
->>>>>>> Stashed changes