generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '529a9893d769f381b72785c500662be2020da5fe'

Browse Source 
* commit '529a9893d769f381b72785c500662be2020da5fe':
  avframe: mark source frame const in _ref and _clone

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-10-28 10:28:29 +01:00
commit 078dab551d
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavutil/frame.c
View File

@ -244,7 +244,7 @@ int av_frame_get_buffer(AVFrame *frame, int align)
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
int av_frame_ref(AVFrame *dst, AVFrame *src) int av_frame_ref(AVFrame *dst, const AVFrame *src)
{ {
int i, ret = 0; int i, ret = 0;
@ -335,7 +335,7 @@ fail:
return ret; return ret;
} }
AVFrame *av_frame_clone(AVFrame *src) AVFrame *av_frame_clone(const AVFrame *src)
{ {
AVFrame *ret = av_frame_alloc(); AVFrame *ret = av_frame_alloc();

4
libavutil/frame.h
View File

@ -549,7 +549,7 @@ void av_frame_free(AVFrame **frame);
* *
* @return 0 on success, a negative AVERROR on error * @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. * 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. * @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. * Unreference all the buffers referenced by frame and reset the frame fields.