media/libtheora/bug468275-r18219.patch@b8a032363ba2
media/libtheora/bug468275-r18219.patch
Thu, 22 Jan 2015 13:21:57 +0100
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Thu, 22 Jan 2015 13:21:57 +0100
- branch
- TOR_BUG_9701
- changeset 15
- b8a032363ba2
- permissions
- -rw-r--r--
Incorporate requested changes from Mozilla in review:
https://bugzilla.mozilla.org/show_bug.cgi?id=1123480#c6
1 diff --git a/media/libtheora/lib/state.c b/media/libtheora/lib/state.c
2 --- a/media/libtheora/lib/state.c
3 +++ b/media/libtheora/lib/state.c
4 @@ -583,17 +583,17 @@ static int oc_state_ref_bufs_init(oc_the
5 ref_frame_sz<yplane_sz||ref_frame_data_sz/_nrefs!=ref_frame_sz){
6 return TH_EIMPL;
7 }
8 ref_frame_data=oc_aligned_malloc(ref_frame_data_sz,16);
9 frag_buf_offs=_state->frag_buf_offs=
10 _ogg_malloc(_state->nfrags*sizeof(*frag_buf_offs));
11 if(ref_frame_data==NULL||frag_buf_offs==NULL){
12 _ogg_free(frag_buf_offs);
13 - _ogg_free(ref_frame_data);
14 + oc_aligned_free(ref_frame_data);
15 return TH_EFAULT;
16 }
17 /*Set up the width, height and stride for the image buffers.*/
18 _state->ref_frame_bufs[0][0].width=info->frame_width;
19 _state->ref_frame_bufs[0][0].height=info->frame_height;
20 _state->ref_frame_bufs[0][0].stride=yhstride;
21 _state->ref_frame_bufs[0][1].width=_state->ref_frame_bufs[0][2].width=
22 info->frame_width>>hdec;
