diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-01 13:59:47 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-01 13:59:50 +0200 |
| commit | 9408d990c46c1993259058e7d70c417d1030bb10 (patch) | |
| tree | 4e5549dfaf55c4d1c791fb5949e9a4e025d0c0a3 /libavutil | |
| parent | 0f5a40c2a4bc2ae6548d75b9a9f3ef568e995883 (diff) | |
| parent | 3c8bff0740abb3785968823429e77bd41c65debf (diff) | |
| download | ffmpeg-9408d990c46c1993259058e7d70c417d1030bb10.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avframe: have av_frame_get_side_data take const AVFrame*
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/frame.c | 2 | ||||
| -rw-r--r-- | libavutil/frame.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libavutil/frame.c b/libavutil/frame.c index bac6c63980..a06d525606 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -562,7 +562,7 @@ AVFrameSideData *av_frame_new_side_data(AVFrame *frame, return ret; } -AVFrameSideData *av_frame_get_side_data(AVFrame *frame, +AVFrameSideData *av_frame_get_side_data(const AVFrame *frame, enum AVFrameSideDataType type) { int i; diff --git a/libavutil/frame.h b/libavutil/frame.h index 8cb3000aaa..ac4057bc6f 100644 --- a/libavutil/frame.h +++ b/libavutil/frame.h @@ -644,7 +644,7 @@ AVFrameSideData *av_frame_new_side_data(AVFrame *frame, * @return a pointer to the side data of a given type on success, NULL if there * is no side data with such type in this frame. */ -AVFrameSideData *av_frame_get_side_data(AVFrame *frame, +AVFrameSideData *av_frame_get_side_data(const AVFrame *frame, enum AVFrameSideDataType type); #endif /* AVUTIL_FRAME_H */ |