diff options
| author | Adam Hampson <ahampson@google.com> | 2013-11-13 09:25:33 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-13 09:25:33 -0800 |
| commit | 56477eb724972c2fe0441dfa7baaad00b7927add (patch) | |
| tree | a0b05102681021a5774c5b3102e876cb3851e648 /media/libstagefright/AwesomePlayer.cpp | |
| parent | 22990fe1ee3531e84dbadb7ff9ffd68d5bbe9060 (diff) | |
| parent | 27ae268af29b25d85f83aa34e92ac8b7f6c87c6f (diff) | |
| download | frameworks_av-56477eb724972c2fe0441dfa7baaad00b7927add.zip frameworks_av-56477eb724972c2fe0441dfa7baaad00b7927add.tar.gz frameworks_av-56477eb724972c2fe0441dfa7baaad00b7927add.tar.bz2 | |
am 27ae268a: am 00cb884f: Merge "StageFright: Removes hacks for Nvidia MPEG2 decoder" into jb-mr2-dev
* commit '27ae268af29b25d85f83aa34e92ac8b7f6c87c6f':
StageFright: Removes hacks for Nvidia MPEG2 decoder
Diffstat (limited to 'media/libstagefright/AwesomePlayer.cpp')
| -rw-r--r-- | media/libstagefright/AwesomePlayer.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/media/libstagefright/AwesomePlayer.cpp b/media/libstagefright/AwesomePlayer.cpp index e1f6563..e5be878 100644 --- a/media/libstagefright/AwesomePlayer.cpp +++ b/media/libstagefright/AwesomePlayer.cpp @@ -1202,8 +1202,7 @@ void AwesomePlayer::initRenderer_l() { setVideoScalingMode_l(mVideoScalingMode); if (USE_SURFACE_ALLOC && !strncmp(component, "OMX.", 4) - && strncmp(component, "OMX.google.", 11) - && strcmp(component, "OMX.Nvidia.mpeg2v.decode")) { + && strncmp(component, "OMX.google.", 11)) { // Hardware decoders avoid the CPU color conversion by decoding // directly to ANativeBuffers, so we must use a renderer that // just pushes those buffers to the ANativeWindow. |