diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-03 09:52:39 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-03 09:52:39 +0200 |
| commit | 5fa5e73e81f191be0c4761bb4c517fdd39aff82e (patch) | |
| tree | 139e9170b7999ffe132e33a2a3b782d2d99c07f4 /libavutil | |
| parent | 59b55619b6edef363532825c4cf16ac2bfdd21a1 (diff) | |
| parent | 1aa24df74c052a73175c43e57d35b4835e537ec8 (diff) | |
| download | ffmpeg-5fa5e73e81f191be0c4761bb4c517fdd39aff82e.tar.gz | |
Merge commit '1aa24df74c052a73175c43e57d35b4835e537ec8'
* commit '1aa24df74c052a73175c43e57d35b4835e537ec8':
lavu: Deprecate AVFrame.error[]
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/frame.c | 4 | ||||
| -rw-r--r-- | libavutil/frame.h | 5 | ||||
| -rw-r--r-- | libavutil/version.h | 3 |
3 files changed, 11 insertions, 1 deletions
diff --git a/libavutil/frame.c b/libavutil/frame.c index 7b4177bc95..4297e0741f 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -315,7 +315,11 @@ static int frame_copy_props(AVFrame *dst, const AVFrame *src, int force_copy) av_dict_copy(&dst->metadata, src->metadata, 0); +#if FF_API_ERROR_FRAME +FF_DISABLE_DEPRECATION_WARNINGS memcpy(dst->error, src->error, sizeof(dst->error)); +FF_ENABLE_DEPRECATION_WARNINGS +#endif for (i = 0; i < src->nb_side_data; i++) { const AVFrameSideData *sd_src = src->side_data[i]; diff --git a/libavutil/frame.h b/libavutil/frame.h index 5270798c55..9c6061a11b 100644 --- a/libavutil/frame.h +++ b/libavutil/frame.h @@ -282,10 +282,13 @@ typedef struct AVFrame { */ void *opaque; +#if FF_API_ERROR_FRAME /** - * error + * @deprecated unused */ + attribute_deprecated uint64_t error[AV_NUM_DATA_POINTERS]; +#endif /** * When decoding, this signals how much the picture must be delayed. diff --git a/libavutil/version.h b/libavutil/version.h index 306372cf38..b100b947a1 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -108,6 +108,9 @@ #ifndef FF_API_PLUS1_MINUS1 #define FF_API_PLUS1_MINUS1 (LIBAVUTIL_VERSION_MAJOR < 56) #endif +#ifndef FF_API_ERROR_FRAME +#define FF_API_ERROR_FRAME (LIBAVUTIL_VERSION_MAJOR < 56) +#endif /** |