aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-04-08 13:05:38 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-04-08 13:05:38 +0200
commit845ab37b05e1101f538543f4e35ce0672ad8690b (patch)
treeb80ad4dbce0aece5992a4c42086ab868ee6fa9ec
parent386601286fed2dff5e1955bc21a0256f6f35ab19 (diff)
downloadffmpeg-845ab37b05e1101f538543f4e35ce0672ad8690b.tar.gz
avcodec/h264_slice: Fix uninitialized variable
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/h264_slice.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c
index 2289c4e210..d3c57eb3b5 100644
--- a/libavcodec/h264_slice.c
+++ b/libavcodec/h264_slice.c
@@ -1434,13 +1434,13 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl)
}
sl->mb_mbaff = 0;
+ mb_aff_frame = 0;
last_mb_aff_frame = h->mb_aff_frame;
last_pic_structure = h->picture_structure;
last_pic_droppable = h->droppable;
droppable = h->nal_ref_idc == 0;
if (h->sps.frame_mbs_only_flag) {
picture_structure = PICT_FRAME;
- mb_aff_frame = 0;
} else {
if (!h->sps.direct_8x8_inference_flag && slice_type == AV_PICTURE_TYPE_B) {
av_log(h->avctx, AV_LOG_ERROR, "This stream was generated by a broken encoder, invalid 8x8 inference\n");