virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-29 22:00:58 +02:00
Code Issues Releases Activity

Merge remote-tracking branch 'qatar/master'

Browse Source 
* qatar/master:
  avframe: have av_frame_get_side_data take const AVFrame*

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-08-01 13:59:47 +02:00
commit 9408d990c4
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavutil/frame.c
View File

@ -562,7 +562,7 @@ AVFrameSideData *av_frame_new_side_data(AVFrame *frame,
return ret; return ret;
} }
AVFrameSideData *av_frame_get_side_data(AVFrame *frame, AVFrameSideData *av_frame_get_side_data(const AVFrame *frame,
enum AVFrameSideDataType type) enum AVFrameSideDataType type)
{ {
int i; int i;

2
libavutil/frame.h
View File

@ -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 * @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. * 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); enum AVFrameSideDataType type);
#endif /* AVUTIL_FRAME_H */ #endif /* AVUTIL_FRAME_H */