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>
12 years ago · 9408d990c4
parent 0f5a40c2a4 3c8bff0740
commit 9408d990c4
2 changed files with 2 additions and 2 deletions
--- 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;
--- 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 */