diff options
| author | Steve Kondik <shade@chemlab.org> | 2014-07-25 05:33:22 -0700 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2014-07-25 05:33:22 -0700 |
| commit | a05c01b7806ce0ff2b110ad36dbfe5727cb8cd4f (patch) | |
| tree | a5d0d048e3976331e7001ed2eea256c67dc10b2a /libFLAC/ogg_helper.c | |
| parent | d3c04b5f963ef86e1aeb74656151f175aefa4c48 (diff) | |
| download | android_external_flac-a05c01b7806ce0ff2b110ad36dbfe5727cb8cd4f.tar.gz android_external_flac-a05c01b7806ce0ff2b110ad36dbfe5727cb8cd4f.tar.bz2 android_external_flac-a05c01b7806ce0ff2b110ad36dbfe5727cb8cd4f.zip | |
Upgrade to libFLAC 1.3.0cm-11.0-XNPH44S-bacon-5fa8c79c0bcm-11.0-XNPH05Q-tomato-9828f8e9cccm-11.0-XNPH05Q-bacon-5229c4ef56stable/cm-11.0-XNG3Cstable/cm-11.0-XNG2Sstable/cm-11.0-XNF9Xstable/cm-11.0-XNF8Ystable/cm-11.0shipping/cm-11.0
Change-Id: Ibd991640b7c85a96f4d1a43381acd199a6d197fd
Diffstat (limited to 'libFLAC/ogg_helper.c')
| -rw-r--r-- | libFLAC/ogg_helper.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libFLAC/ogg_helper.c b/libFLAC/ogg_helper.c index 73f9f0b..255e3cd 100644 --- a/libFLAC/ogg_helper.c +++ b/libFLAC/ogg_helper.c @@ -1,5 +1,6 @@ /* libFLAC - Free Lossless Audio Codec - * Copyright (C) 2004,2005,2006,2007 Josh Coalson + * Copyright (C) 2004-2009 Josh Coalson + * Copyright (C) 2011-2013 Xiph.Org Foundation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -113,7 +114,7 @@ FLAC__bool simple_ogg_page__get_at(FLAC__StreamEncoder *encoder, FLAC__uint64 po } /* allocate space for the page header */ - if(0 == (page->header = (unsigned char *)safe_malloc_(OGG_MAX_HEADER_LEN))) { + if(0 == (page->header = safe_malloc_(OGG_MAX_HEADER_LEN))) { encoder->protected_->state = FLAC__STREAM_ENCODER_MEMORY_ALLOCATION_ERROR; return false; } @@ -155,7 +156,7 @@ FLAC__bool simple_ogg_page__get_at(FLAC__StreamEncoder *encoder, FLAC__uint64 po } /* allocate space for the page body */ - if(0 == (page->body = (unsigned char *)safe_malloc_(page->body_len))) { + if(0 == (page->body = safe_malloc_(page->body_len))) { encoder->protected_->state = FLAC__STREAM_ENCODER_MEMORY_ALLOCATION_ERROR; return false; } |