diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-14 12:02:43 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-14 12:15:02 +0100 |
| commit | 905e7eb41389e4394e9c6e459b7d1a99dc30b075 (patch) | |
| tree | 1d182a4e747144648ab74c4a7dfcc88395aa7c29 /libavcodec/utils.c | |
| parent | 360d71707f7d3b1c02be857515392a843f159b85 (diff) | |
| parent | f099d3d1d5466bd63f4ab36270d169ff9ea613b8 (diff) | |
Merge commit 'f099d3d1d5466bd63f4ab36270d169ff9ea613b8'
* commit 'f099d3d1d5466bd63f4ab36270d169ff9ea613b8':
Add av_log_{ask_for_sample|missing_feature} replacements to libavutil
ismindex: Check the return value of allocations
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/utils.c')
| -rw-r--r-- | libavcodec/utils.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 46fc71095e..64d2e7e16e 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -45,6 +45,7 @@ #include "frame_thread_encoder.h" #include "internal.h" #include "bytestream.h" +#include "version.h" #include <stdlib.h> #include <stdarg.h> #include <limits.h> @@ -2859,6 +2860,7 @@ int ff_match_2uint16(const uint16_t(*tab)[2], int size, int a, int b) return i; } +#if FF_API_MISSING_SAMPLE 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 FFmpeg " @@ -2883,6 +2885,7 @@ void av_log_ask_for_sample(void *avc, const char *msg, ...) va_end(argument_list); } +#endif /* FF_API_MISSING_SAMPLE */ static AVHWAccel *first_hwaccel = NULL; |