diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2014-10-08 21:16:06 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-08 21:16:06 +0000 |
| commit | c0db452b030b4e169a3c539847ccba424ba39c81 (patch) | |
| tree | cfc512535fcb70d9e367f3bb558f7cecf1637ba6 /media/libstagefright/codecs | |
| parent | d87131038bf79473998e9bf73a2710b5b6c65070 (diff) | |
| parent | dba83c1cb1bef03bc5d1760c2639d06ff71c0fa7 (diff) | |
| download | frameworks_av-c0db452b030b4e169a3c539847ccba424ba39c81.zip frameworks_av-c0db452b030b4e169a3c539847ccba424ba39c81.tar.gz frameworks_av-c0db452b030b4e169a3c539847ccba424ba39c81.tar.bz2 | |
am dba83c1c: libstagefright: compile errors
* commit 'dba83c1cb1bef03bc5d1760c2639d06ff71c0fa7':
libstagefright: compile errors
Diffstat (limited to 'media/libstagefright/codecs')
| -rw-r--r-- | media/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp | 1 | ||||
| -rw-r--r-- | media/libstagefright/codecs/on2/dec/SoftVPX.cpp | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/media/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp b/media/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp index 1f4b6fd..e399984 100644 --- a/media/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp +++ b/media/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp @@ -382,5 +382,6 @@ android::SoftOMXComponent *createSoftOMXComponent( } else { CHECK(!"Unknown component"); } + return NULL; } diff --git a/media/libstagefright/codecs/on2/dec/SoftVPX.cpp b/media/libstagefright/codecs/on2/dec/SoftVPX.cpp index 828577a..87d6961 100644 --- a/media/libstagefright/codecs/on2/dec/SoftVPX.cpp +++ b/media/libstagefright/codecs/on2/dec/SoftVPX.cpp @@ -189,4 +189,5 @@ android::SoftOMXComponent *createSoftOMXComponent( } else { CHECK(!"Unknown component"); } + return NULL; } |