diff options
author | Vittorio Giovara <vittorio.giovara@gmail.com> | 2016-12-05 14:27:30 -0500 |
---|---|---|
committer | Vittorio Giovara <vittorio.giovara@gmail.com> | 2017-03-23 10:09:12 +0100 |
commit | 0337adfab5d14a17bf4d5060aa0425e4049a9862 (patch) | |
tree | 016efa722d6a8079c411e4e9dd74950c8729fd79 /libavcodec | |
parent | bc143ce1ac3f8cd851a7e6be69d9a1fbe6b633b6 (diff) | |
download | ffmpeg-0337adfab5d14a17bf4d5060aa0425e4049a9862.tar.gz |
lavc: Drop deprecated missing sample log function
Deprecated in 01/2013.
Diffstat (limited to 'libavcodec')
-rw-r--r-- | libavcodec/avcodec.h | 30 | ||||
-rw-r--r-- | libavcodec/utils.c | 29 | ||||
-rw-r--r-- | libavcodec/version.h | 3 |
3 files changed, 0 insertions, 62 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 5f83a36ea0..9f7057e840 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -5310,36 +5310,6 @@ void av_fast_padded_malloc(void *ptr, unsigned int *size, size_t min_size); */ unsigned int av_xiphlacing(unsigned char *s, unsigned int v); -#if FF_API_MISSING_SAMPLE -/** - * Log a generic warning message about a missing feature. This function is - * intended to be used internally by Libav (libavcodec, libavformat, etc.) - * only, and would normally not be used by applications. - * @param[in] avc a pointer to an arbitrary struct of which the first field is - * a pointer to an AVClass struct - * @param[in] feature string containing the name of the missing feature - * @param[in] want_sample indicates if samples are wanted which exhibit this feature. - * If want_sample is non-zero, additional verbiage will be added to the log - * message which tells the user how to report samples to the development - * mailing list. - * @deprecated Use avpriv_report_missing_feature() instead. - */ -attribute_deprecated -void av_log_missing_feature(void *avc, const char *feature, int want_sample); - -/** - * Log a generic warning message asking for a sample. This function is - * intended to be used internally by Libav (libavcodec, libavformat, etc.) - * only, and would normally not be used by applications. - * @param[in] avc a pointer to an arbitrary struct of which the first field is - * a pointer to an AVClass struct - * @param[in] msg string containing an optional message, or NULL if no message - * @deprecated Use avpriv_request_sample() instead. - */ -attribute_deprecated -void av_log_ask_for_sample(void *avc, const char *msg, ...) av_printf_format(2, 3); -#endif /* FF_API_MISSING_SAMPLE */ - /** * Register the hardware accelerator hwaccel. */ diff --git a/libavcodec/utils.c b/libavcodec/utils.c index ea4d5fa312..8a481dd025 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -1359,35 +1359,6 @@ int ff_match_2uint16(const uint16_t(*tab)[2], int size, int a, int b) return i; } -#if FF_API_MISSING_SAMPLE -FF_DISABLE_DEPRECATION_WARNINGS -void av_log_missing_feature(void *avc, const char *feature, int want_sample) -{ - av_log(avc, AV_LOG_WARNING, "%s is not implemented. Update your Libav " - "version to the newest one from Git. If the problem still " - "occurs, it means that your file has a feature which has not " - "been implemented.\n", feature); - if(want_sample) - av_log_ask_for_sample(avc, NULL); -} - -void av_log_ask_for_sample(void *avc, const char *msg, ...) -{ - va_list argument_list; - - va_start(argument_list, msg); - - if (msg) - av_vlog(avc, AV_LOG_WARNING, msg, argument_list); - av_log(avc, AV_LOG_WARNING, "If you want to help, upload a sample " - "of this file to ftp://upload.libav.org/incoming/ " - "and contact the libav-devel mailing list.\n"); - - va_end(argument_list); -} -FF_ENABLE_DEPRECATION_WARNINGS -#endif /* FF_API_MISSING_SAMPLE */ - static AVHWAccel *first_hwaccel = NULL; void av_register_hwaccel(AVHWAccel *hwaccel) diff --git a/libavcodec/version.h b/libavcodec/version.h index 98c93d3bc6..95b8ed6391 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -47,9 +47,6 @@ * the public API and may change, break or disappear at any time. */ -#ifndef FF_API_MISSING_SAMPLE -#define FF_API_MISSING_SAMPLE (LIBAVCODEC_VERSION_MAJOR < 58) -#endif #ifndef FF_API_LOWRES #define FF_API_LOWRES (LIBAVCODEC_VERSION_MAJOR < 58) #endif |