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/dxva2_h264.c | |
| parent | e970b576d28dd515d4ccd665b53763e228816cac (diff) | |
| parent | a12d3188cbec15e22070e139fa5cc541da07e2c3 (diff) | |
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/dxva2_h264.c')
| -rw-r--r-- | libavcodec/dxva2_h264.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/dxva2_h264.c b/libavcodec/dxva2_h264.c index 8518978343..451d8a04cb 100644 --- a/libavcodec/dxva2_h264.c +++ b/libavcodec/dxva2_h264.c @@ -240,7 +240,7 @@ static void fill_slice_long(AVCodecContext *avctx, DXVA_Slice_H264_Long *slice, unsigned i; for (i = 0; i < FF_ARRAY_ELEMS(slice->RefPicList[list]); i++) { if (list < sl->list_count && i < sl->ref_count[list]) { - const H264Picture *r = &sl->ref_list[list][i]; + const H264Picture *r = sl->ref_list[list][i].parent; unsigned plane; unsigned index; if (ctx->workaround & FF_DXVA2_WORKAROUND_INTEL_CLEARVIDEO) |