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/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/h264.c')
| -rw-r--r-- | libavcodec/h264.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 1974f6611c..18e5a4dd8b 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -77,7 +77,7 @@ static void h264_er_decode_mb(void *opaque, int ref, int mv_dir, int mv_type, * practice then correct remapping should be added. */ if (ref >= sl->ref_count[0]) ref = 0; - if (!sl->ref_list[0][ref].f.data[0]) { + if (!sl->ref_list[0][ref].data[0]) { av_log(h->avctx, AV_LOG_DEBUG, "Reference not available for error concealing\n"); ref = 0; } |