summaryrefslogtreecommitdiffstats
path: root/libhb/platform
diff options
context:
space:
mode:
authorRodeo <[email protected]>2012-06-29 12:29:16 +0000
committerRodeo <[email protected]>2012-06-29 12:29:16 +0000
commit5e717e1176453585997dc7881252b7e77f360095 (patch)
tree868b2273bea9da250ab6c71ba7e5862eb4f19932 /libhb/platform
parent24019e7812e9da31dd90c353ece7706a1247442a (diff)
encca_aac.c: oesc.mDataByteSize is signed.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4791 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'libhb/platform')
-rw-r--r--libhb/platform/macosx/encca_aac.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/libhb/platform/macosx/encca_aac.c b/libhb/platform/macosx/encca_aac.c
index ab5977f96..d67e039b2 100644
--- a/libhb/platform/macosx/encca_aac.c
+++ b/libhb/platform/macosx/encca_aac.c
@@ -87,20 +87,20 @@ static long ReadESDSDescExt(void* descExt, UInt8 **buffer, UInt32 *size, int ver
*size = 0;
if (versionFlags)
- esds += 4; // version + flags
+ esds += 4; // version + flags
readDescr(&esds, &tag);
- esds += 2; // ID
+ esds += 2; // ID
if (tag == MP4ESDescrTag)
- esds++; // priority
+ esds++; // priority
readDescr(&esds, &tag);
if (tag == MP4DecConfigDescrTag)
{
- esds++; // object type id
- esds++; // stream type
- esds += 3; // buffer size db
- esds += 4; // max bitrate
- esds += 4; // average bitrate
+ esds++; // object type id
+ esds++; // stream type
+ esds += 3; // buffer size db
+ esds += 4; // max bitrate
+ esds += 4; // average bitrate
len = readDescr(&esds, &tag);
if (tag == MP4DecSpecificDescrTag)
@@ -440,7 +440,7 @@ static hb_buffer_t* Encode(hb_work_object_t *w)
hb_log("encCoreAudio: unexpected error in AudioConverterFillComplexBuffer()");
}
// only drop the output buffer if it's actually empty
- if (!odesc.mDataByteSize || !npackets)
+ if (!npackets || odesc.mDataByteSize <= 0)
{
hb_log("encCoreAudio: 0 packets returned");
return NULL;