media/libtheora/bug625773-r17780.patch@b8a032363ba2 (annotated)
media/libtheora/bug625773-r17780.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/decode.c b/media/libtheora/lib/decode.c |
| michael@0 | 2 | --- a/media/libtheora/lib/decode.c |
| michael@0 | 3 | +++ b/media/libtheora/lib/decode.c |
| michael@0 | 4 | @@ -2072,18 +2072,17 @@ static void oc_dec_init_dummy_frame(th_d |
| michael@0 | 5 | sizeof(_dec->pp_frame_buf[0])*3); |
| michael@0 | 6 | info=&_dec->state.info; |
| michael@0 | 7 | yhstride=abs(_dec->state.ref_ystride[0]); |
| michael@0 | 8 | yheight=info->frame_height+2*OC_UMV_PADDING; |
| michael@0 | 9 | chstride=abs(_dec->state.ref_ystride[1]); |
| michael@0 | 10 | cheight=yheight>>!(info->pixel_fmt&2); |
| michael@0 | 11 | yplane_sz=yhstride*(size_t)yheight+16; |
| michael@0 | 12 | cplane_sz=chstride*(size_t)cheight; |
| michael@0 | 13 | - yoffset=_dec->state.ref_ystride[0]*(yheight-1)- |
| michael@0 | 14 | - (OC_UMV_PADDING+OC_UMV_PADDING*(ptrdiff_t)yhstride); |
| michael@0 | 15 | + yoffset=yhstride*(ptrdiff_t)(yheight-OC_UMV_PADDING-1)+OC_UMV_PADDING; |
| michael@0 | 16 | memset(_dec->state.ref_frame_data[0]-yoffset,0x80,yplane_sz+2*cplane_sz); |
| michael@0 | 17 | } |
| michael@0 | 18 | |
| michael@0 | 19 | int th_decode_packetin(th_dec_ctx *_dec,const ogg_packet *_op, |
| michael@0 | 20 | ogg_int64_t *_granpos){ |
| michael@0 | 21 | int ret; |
| michael@0 | 22 | if(_dec==NULL||_op==NULL)return TH_EFAULT; |
| michael@0 | 23 | /*A completely empty packet indicates a dropped frame and is treated exactly |
