[FFmpeg-cvslog] avcodec/dxva2_h264: fix slice offset in long slice struct after ca2f19b9

Hendrik Leppkes git at videolan.org
Sun May 8 17:48:49 CEST 2016


ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Sun May  8 17:37:30 2016 +0200| [64fd62d68abeb3a7325695061c9cb21e13c02d08] | committer: Hendrik Leppkes

avcodec/dxva2_h264: fix slice offset in long slice struct after ca2f19b9

The GetBitContext now includes the NAL header, which offsets the slice by
one byte, which needs to be accounted for here.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=64fd62d68abeb3a7325695061c9cb21e13c02d08
---

 libavcodec/dxva2_h264.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/dxva2_h264.c b/libavcodec/dxva2_h264.c
index 7048c4a..bcba875 100644
--- a/libavcodec/dxva2_h264.c
+++ b/libavcodec/dxva2_h264.c
@@ -228,7 +228,7 @@ static void fill_slice_long(AVCodecContext *avctx, DXVA_Slice_H264_Long *slice,
 
     slice->first_mb_in_slice     = (sl->mb_y >> FIELD_OR_MBAFF_PICTURE(h)) * h->mb_width + sl->mb_x;
     slice->NumMbsForSlice        = 0; /* XXX it is set once we have all slices */
-    slice->BitOffsetToSliceData  = get_bits_count(&sl->gb);
+    slice->BitOffsetToSliceData  = get_bits_count(&sl->gb) - 8;
     slice->slice_type            = ff_h264_get_slice_type(sl);
     if (sl->slice_type_fixed)
         slice->slice_type += 5;



More information about the ffmpeg-cvslog mailing list