media/libtheora/bug468275-r18219.patch@b8a032363ba2 (annotated)
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
| michael@0 | 1 | diff --git a/media/libtheora/lib/state.c b/media/libtheora/lib/state.c |
| michael@0 | 2 | --- a/media/libtheora/lib/state.c |
| michael@0 | 3 | +++ b/media/libtheora/lib/state.c |
| michael@0 | 4 | @@ -583,17 +583,17 @@ static int oc_state_ref_bufs_init(oc_the |
| michael@0 | 5 | ref_frame_sz<yplane_sz||ref_frame_data_sz/_nrefs!=ref_frame_sz){ |
| michael@0 | 6 | return TH_EIMPL; |
| michael@0 | 7 | } |
| michael@0 | 8 | ref_frame_data=oc_aligned_malloc(ref_frame_data_sz,16); |
| michael@0 | 9 | frag_buf_offs=_state->frag_buf_offs= |
| michael@0 | 10 | _ogg_malloc(_state->nfrags*sizeof(*frag_buf_offs)); |
| michael@0 | 11 | if(ref_frame_data==NULL||frag_buf_offs==NULL){ |
| michael@0 | 12 | _ogg_free(frag_buf_offs); |
| michael@0 | 13 | - _ogg_free(ref_frame_data); |
| michael@0 | 14 | + oc_aligned_free(ref_frame_data); |
| michael@0 | 15 | return TH_EFAULT; |
| michael@0 | 16 | } |
| michael@0 | 17 | /*Set up the width, height and stride for the image buffers.*/ |
| michael@0 | 18 | _state->ref_frame_bufs[0][0].width=info->frame_width; |
| michael@0 | 19 | _state->ref_frame_bufs[0][0].height=info->frame_height; |
| michael@0 | 20 | _state->ref_frame_bufs[0][0].stride=yhstride; |
| michael@0 | 21 | _state->ref_frame_bufs[0][1].width=_state->ref_frame_bufs[0][2].width= |
| michael@0 | 22 | info->frame_width>>hdec; |
