Commit c9aab8a1 authored by Michael Niedermayer's avatar Michael Niedermayer Committed by Janne Grunau

h264: use mbaff ref indices in fill_colmap() only for mbaff references

Prevents writing beyond array bounds.
Signed-off-by: 's avatarJanne Grunau <janne-libav@jannau.net>
parent 61c6eef5
......@@ -89,7 +89,8 @@ static void fill_colmap(H264Context *h, int map[2][16+32], int list, int field,
for(j=start; j<end; j++){
if (4 * h->ref_list[0][j].frame_num + (h->ref_list[0][j].f.reference & 3) == poc) {
int cur_ref= mbafi ? (j-16)^field : j;
map[list][2*old_ref + (rfield^field) + 16] = cur_ref;
if (ref1->mbaff)
map[list][2 * old_ref + (rfield^field) + 16] = cur_ref;
if(rfield == field || !interl)
map[list][old_ref] = cur_ref;
break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment