r24454 2024-06-03 acota FIX: old variable following merge conflicts at r24422 [snag 639][q13159]

M /trunk/include/ffmpeg_processing.php
r24424 2024-05-28 acota CHG: Removing video_preview_hls_support config [q13159]

M /trunk
M /trunk/batch/recreate_previews.php
M /trunk/css
M /trunk/include/config.default.php
M /trunk/include/edit_upload_options.php
M /trunk/include/ffmpeg_processing.php
M /trunk/include/preview_preprocessing.php
M /trunk/lib/js
M /trunk/pages/edit.php
M /trunk/pages/video_player.php
M /trunk/pages/view.php
M /trunk/plugins/video_splice/pages/trim.php
r24422 2024-05-28 acota CHG: Removing code from include/ffmpeg_processing.php again after recent changes in trunk [branches/20240516_acota_q13159][q13159]

M /branches/20240516_acota_q13159/include/ffmpeg_processing.php
r24421 2024-05-28 acota CHG: update from trunk [branches/20240516_acota_q13159][q13159]

M /branches/20240516_acota_q13159
M /branches/20240516_acota_q13159/api/index.php
M /branches/20240516_acota_q13159/batch/cron_jobs/999_file_integrity_check.php
M /branches/20240516_acota_q13159/batch/expiry_notification.php
M /branches/20240516_acota_q13159/css
M /branches/20240516_acota_q13159/css/global.css
A /branches/20240516_acota_q13159/include/CommandPlaceholderArg.php
M /branches/20240516_acota_q13159/include/authenticate.php
M /branches/20240516_acota_q13159/include/boot.php
M /branches/20240516_acota_q13159/include/collections_functions.php
M /branches/20240516_acota_q13159/include/comment_functions.php
M /branches/20240516_acota_q13159/include/comment_resources.php
M /branches/20240516_acota_q13159/include/config.default.php
M /branches/20240516_acota_q13159/include/config_functions.php
M /branches/20240516_acota_q13159/include/dash_functions.php
M /branches/20240516_acota_q13159/include/download_summary.php
M /branches/20240516_acota_q13159/include/edit_upload_options.php
M /branches/20240516_acota_q13159/include/ffmpeg_processing.php
M /branches/20240516_acota_q13159/include/file_functions.php
M /branches/20240516_acota_q13159/include/footer.php
M /branches/20240516_acota_q13159/include/general_functions.php
M /branches/20240516_acota_q13159/include/header.php
M /branches/20240516_acota_q13159/include/image_processing.php
M /branches/20240516_acota_q13159/include/job_handlers/collection_download.php
M /branches/20240516_acota_q13159/include/job_handlers/create_previews.php
M /branches/20240516_acota_q13159/include/login_functions.php
M /branches/20240516_acota_q13159/include/message_functions.php
M /branches/20240516_acota_q13159/include/preview_preprocessing.php
M /branches/20240516_acota_q13159/include/render_functions.php
M /branches/20240516_acota_q13159/include/research_functions.php
M /branches/20240516_acota_q13159/include/resource_functions.php
M /branches/20240516_acota_q13159/include/search_public.php
M /branches/20240516_acota_q13159/include/tab_functions.php
M /branches/20240516_acota_q13159/include/test_functions.php
M /branches/20240516_acota_q13159/include/user_functions.php
M /branches/20240516_acota_q13159/include/version.php
A /branches/20240516_acota_q13159/js
M /branches/20240516_acota_q13159/languages/ar.php
M /branches/20240516_acota_q13159/languages/ca.php
M /branches/20240516_acota_q13159/languages/da.php
M /branches/20240516_acota_q13159/languages/de.php
M /branches/20240516_acota_q13159/languages/el.php
M /branches/20240516_acota_q13159/languages/en.php
M /branches/20240516_acota_q13159/languages/es-AR.php
M /branches/20240516_acota_q13159/languages/es.php
M /branches/20240516_acota_q13159/languages/fi.php
M /branches/20240516_acota_q13159/languages/fr.php
M /branches/20240516_acota_q13159/languages/hr.php
M /branches/20240516_acota_q13159/languages/id.php
M /branches/20240516_acota_q13159/languages/it.php
M /branches/20240516_acota_q13159/languages/jp.php
M /branches/20240516_acota_q13159/languages/nl.php
M /branches/20240516_acota_q13159/languages/no.php
M /branches/20240516_acota_q13159/languages/pl.php
M /branches/20240516_acota_q13159/languages/pt-BR.php
M /branches/20240516_acota_q13159/languages/pt.php
M /branches/20240516_acota_q13159/languages/ro.php
M /branches/20240516_acota_q13159/languages/ru.php
M /branches/20240516_acota_q13159/languages/sk.php
M /branches/20240516_acota_q13159/languages/sv.php
M /branches/20240516_acota_q13159/languages/zh-CN.php
M /branches/20240516_acota_q13159/lib/js
D /branches/20240516_acota_q13159/lib/js/ajax_collections.js
D /branches/20240516_acota_q13159/lib/js/browsebar_js.php
D /branches/20240516_acota_q13159/lib/js/category_tree.js
D /branches/20240516_acota_q13159/lib/js/contactsheet.js
D /branches/20240516_acota_q13159/lib/js/global.js
D /branches/20240516_acota_q13159/lib/js/metadata_report.js
D /branches/20240516_acota_q13159/lib/js/responsive.js
D /branches/20240516_acota_q13159/lib/js/slideshow_big.js
D /branches/20240516_acota_q13159/lib/js/tagging.js
D /branches/20240516_acota_q13159/lib/js/user_rating_searchview.js
D /branches/20240516_acota_q13159/lib/js/videojs-extras.js
M /branches/20240516_acota_q13159/pages/admin/admin_manage_field_options.php
M /branches/20240516_acota_q13159/pages/ajax/browsebar_load.php
M /branches/20240516_acota_q13159/pages/check.php
M /branches/20240516_acota_q13159/pages/collection_download.php
M /branches/20240516_acota_q13159/pages/collection_log.php
M /branches/20240516_acota_q13159/pages/collection_manage.php
M /branches/20240516_acota_q13159/pages/collection_share.php
M /branches/20240516_acota_q13159/pages/csv_export_results_metadata.php
M /branches/20240516_acota_q13159/pages/download.php
M /branches/20240516_acota_q13159/pages/download_progress.php
M /branches/20240516_acota_q13159/pages/edit.php
M /branches/20240516_acota_q13159/pages/geo_edit.php
M /branches/20240516_acota_q13159/pages/manage_external_shares.php
M /branches/20240516_acota_q13159/pages/mp3_play.php
M /branches/20240516_acota_q13159/pages/resource_email.php
M /branches/20240516_acota_q13159/pages/resource_request.php
M /branches/20240516_acota_q13159/pages/team/team_user.php
M /branches/20240516_acota_q13159/pages/team/team_user_edit.php
M /branches/20240516_acota_q13159/pages/tools/geo_setcoords_from_country.php
M /branches/20240516_acota_q13159/pages/tools/merge_rs_systems.php
M /branches/20240516_acota_q13159/pages/tools/offline_jobs.php
M /branches/20240516_acota_q13159/pages/tools/update_resource_file_sizes.php
M /branches/20240516_acota_q13159/pages/upload_batch.php
M /branches/20240516_acota_q13159/pages/upload_preview.php
M /branches/20240516_acota_q13159/pages/user/user_actions.php
M /branches/20240516_acota_q13159/pages/user/user_messages.php
M /branches/20240516_acota_q13159/pages/video_player.php
M /branches/20240516_acota_q13159/pages/view.php
M /branches/20240516_acota_q13159/pages/view_alternative_files.php
M /branches/20240516_acota_q13159/pages/view_metadata.php
M /branches/20240516_acota_q13159/pages/view_shares.php
M /branches/20240516_acota_q13159/plugins/action_dates/hooks/all.php
M /branches/20240516_acota_q13159/plugins/action_dates/languages/en.php
M /branches/20240516_acota_q13159/plugins/annotate/include/annotate_functions.php
M /branches/20240516_acota_q13159/plugins/csv_upload/hooks/all.php
M /branches/20240516_acota_q13159/plugins/csv_user_import/include/csv_functions.php
M /branches/20240516_acota_q13159/plugins/embedvideo/hooks/view.php
M /branches/20240516_acota_q13159/plugins/format_chooser/include/utility.php
M /branches/20240516_acota_q13159/plugins/image_text/hooks/collection_download.php
M /branches/20240516_acota_q13159/plugins/image_text/hooks/download.php
M /branches/20240516_acota_q13159/plugins/rse_search_notifications/hooks/cron_copy_hitcount.php
M /branches/20240516_acota_q13159/plugins/tms_link/pages/tms_update_script.php
M /branches/20240516_acota_q13159/plugins/transform/pages/crop.php
M /branches/20240516_acota_q13159/plugins/video_bookend/pages/bookend.php
M /branches/20240516_acota_q13159/plugins/video_tracks/hooks/download.php
M /branches/20240516_acota_q13159/plugins/video_tracks/pages/create_video.php
M /branches/20240516_acota_q13159/plugins/vr_view/hooks/all.php
M /branches/20240516_acota_q13159/plugins/vr_view/hooks/preview.php
M /branches/20240516_acota_q13159/plugins/vr_view/include/vr_view_functions.php
A /branches/20240516_acota_q13159/plugins/vr_view/pages/download.php
M /branches/20240516_acota_q13159/tests/test_list/000802_escape_command_args.php
A /branches/20240516_acota_q13159/tests/test_list/000804_safe_download_path.php
A /branches/20240516_acota_q13159/tests/test_list/010602_config_override_by_eval.php
r24347 2024-05-16 acota CHG: Removing code from plugins/video_splice/pages/trim.php [branches/20240516_acota_q13159][q13159]

M /branches/20240516_acota_q13159/plugins/video_splice/pages/trim.php
r24345 2024-05-16 acota CHG: Removing code from pages/view.php [branches/20240516_acota_q13159][q13159]

M /branches/20240516_acota_q13159/pages/view.php
r24344 2024-05-16 acota CHG: Removing code from pages/video_player.php [branches/20240516_acota_q13159][q13159]

M /branches/20240516_acota_q13159/pages/video_player.php
r24343 2024-05-16 acota CHG: Removing code from include/preview_preprocessing.php [branches/20240516_acota_q13159][q13159]

M /branches/20240516_acota_q13159/include/preview_preprocessing.php
r24342 2024-05-16 acota CHG: Removing code from include/ffmpeg_processing.php [branches/20240516_acota_q13159][q13159]

M /branches/20240516_acota_q13159/include/ffmpeg_processing.php
r24341 2024-05-16 acota CHG: Removing code from batch/recreate_previews.php [branches/20240516_acota_q13159][q13159]

M /branches/20240516_acota_q13159/batch/recreate_previews.php
r24340 2024-05-16 acota CHG: Removing config options: video_preview_hls_support, video_preview_player_hls, video_hls_preview_options, video_hls_streams [branches/20240516_acota_q13159][q13159]

M /branches/20240516_acota_q13159/include/config.default.php
r24339 2024-05-16 acota NEW: Creating branch for removing video_preview_hls_support [q13159]

A /branches/20240516_acota_q13159