diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-28 10:28:29 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-28 10:28:47 +0100 |
| commit | 078dab551d53fa979f8110dc8a63deae78036a5a (patch) | |
| tree | 1eb36dfb3a5ada3a842c60f13ef2b5d958610137 | |
| parent | 893063781926aa23a28226384a8c46eea4e1524a (diff) | |
| parent | 529a9893d769f381b72785c500662be2020da5fe (diff) | |
| download | ffmpeg-078dab551d53fa979f8110dc8a63deae78036a5a.tar.gz | |
Merge commit '529a9893d769f381b72785c500662be2020da5fe'
* commit '529a9893d769f381b72785c500662be2020da5fe':
avframe: mark source frame const in _ref and _clone
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavutil/frame.c | 4 | ||||
| -rw-r--r-- | libavutil/frame.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libavutil/frame.c b/libavutil/frame.c index 654f17428b..39e2a1313a 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -244,7 +244,7 @@ int av_frame_get_buffer(AVFrame *frame, int align) return AVERROR(EINVAL); } -int av_frame_ref(AVFrame *dst, AVFrame *src) +int av_frame_ref(AVFrame *dst, const AVFrame *src) { int i, ret = 0; @@ -335,7 +335,7 @@ fail: return ret; } -AVFrame *av_frame_clone(AVFrame *src) +AVFrame *av_frame_clone(const AVFrame *src) { AVFrame *ret = av_frame_alloc(); diff --git a/libavutil/frame.h b/libavutil/frame.h index 1c785ddbe3..3be6892020 100644 --- a/libavutil/frame.h +++ b/libavutil/frame.h @@ -549,7 +549,7 @@ void av_frame_free(AVFrame **frame); * * @return 0 on success, a negative AVERROR on error */ -int av_frame_ref(AVFrame *dst, AVFrame *src); +int av_frame_ref(AVFrame *dst, const AVFrame *src); /** * Create a new frame that references the same data as src. @@ -558,7 +558,7 @@ int av_frame_ref(AVFrame *dst, AVFrame *src); * * @return newly created AVFrame on success, NULL on error. */ -AVFrame *av_frame_clone(AVFrame *src); +AVFrame *av_frame_clone(const AVFrame *src); /** * Unreference all the buffers referenced by frame and reset the frame fields. |