diff options
author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-02-03 12:10:37 +0100 |
---|---|---|
committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-02-03 12:10:37 +0100 |
commit | d4590dda7776ec99e4e879c47b3372a5f4b13dcd (patch) | |
tree | 5319f997c7cd31d610ce5ed80c847bd7d6d043fa /media/libavextensions/stagefright/AVUtils.cpp | |
parent | 998f3a696f0d671832624637c771e3bda3e0c9f5 (diff) | |
parent | fda1413978cabfafdf184c02aa20d2fd8c095616 (diff) | |
download | frameworks_av-d4590dda7776ec99e4e879c47b3372a5f4b13dcd.zip frameworks_av-d4590dda7776ec99e4e879c47b3372a5f4b13dcd.tar.gz frameworks_av-d4590dda7776ec99e4e879c47b3372a5f4b13dcd.tar.bz2 |
Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_frameworks_av into replicant-6.0replicant-6.0-alpha-0003replicant-6.0-alpha-0002
Diffstat (limited to 'media/libavextensions/stagefright/AVUtils.cpp')
-rw-r--r-- | media/libavextensions/stagefright/AVUtils.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/media/libavextensions/stagefright/AVUtils.cpp b/media/libavextensions/stagefright/AVUtils.cpp index bdf5eb6..413026b 100644 --- a/media/libavextensions/stagefright/AVUtils.cpp +++ b/media/libavextensions/stagefright/AVUtils.cpp @@ -448,7 +448,7 @@ status_t AVUtils::HEVCMuxer::makeHEVCCodecSpecificData( List<HEVCParamSet> picParamSets; if ((*codecSpecificDataSize = parseHEVCCodecSpecificData(data, size, - vidParamSets, seqParamSets, picParamSets)) <= 0) { + vidParamSets, seqParamSets, picParamSets)) == 0) { ALOGE("cannot parser codec specific data, bailing out"); return ERROR_MALFORMED; } @@ -885,12 +885,12 @@ size_t AVUtils::HEVCMuxer::parseHEVCCodecSpecificData( } } else { ALOGE("Only VPS, SPS and PPS Nal units are expected"); - return ERROR_MALFORMED; + return 0; } if (nextStartCode == NULL) { ALOGE("Next start code is NULL"); - return ERROR_MALFORMED; + return 0; } // Move on to find the next parameter set |