diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 22:08:19 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 23:05:34 +0100 |
| commit | d8151a7e944aea52d167571badc247c8d9972847 (patch) | |
| tree | 00f3d6dcaf271371dc5a2ef284baefb8697d446d /libavcodec/vaapi_h264.c | |
| parent | e970b576d28dd515d4ccd665b53763e228816cac (diff) | |
| parent | a12d3188cbec15e22070e139fa5cc541da07e2c3 (diff) | |
| download | ffmpeg-d8151a7e944aea52d167571badc247c8d9972847.tar.gz | |
Merge commit 'a12d3188cbec15e22070e139fa5cc541da07e2c3'
* commit 'a12d3188cbec15e22070e139fa5cc541da07e2c3':
h264: use a smaller struct for the ref lists
Conflicts:
libavcodec/h264_direct.c
libavcodec/h264_mb.c
libavcodec/h264_picture.c
libavcodec/h264_refs.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vaapi_h264.c')
| -rw-r--r-- | libavcodec/vaapi_h264.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/vaapi_h264.c b/libavcodec/vaapi_h264.c index 7e01e01960..9794a96036 100644 --- a/libavcodec/vaapi_h264.c +++ b/libavcodec/vaapi_h264.c @@ -156,13 +156,13 @@ static int fill_vaapi_ReferenceFrames(VAPictureParameterBufferH264 *pic_param, * @param[in] ref_count The number of reference pictures in ref_list */ static void fill_vaapi_RefPicList(VAPictureH264 RefPicList[32], - H264Picture *ref_list, + H264Ref *ref_list, unsigned int ref_count) { unsigned int i, n = 0; for (i = 0; i < ref_count; i++) if (ref_list[i].reference) - fill_vaapi_pic(&RefPicList[n++], &ref_list[i], 0); + fill_vaapi_pic(&RefPicList[n++], ref_list[i].parent, 0); for (; n < 32; n++) init_vaapi_pic(&RefPicList[n]); |