diff options
| author | Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org> | 2014-12-10 15:54:00 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-10 15:54:00 +0000 |
| commit | 4e3c2bbc65e03f9515d56dfc079c507aac08a69e (patch) | |
| tree | 982ee79f135306f5396f31cd219003996cfd17a4 | |
| parent | 1546028a2d02837f88f7ea1a4109e7649b665d2f (diff) | |
| parent | 7e45789f5fbcbe68075f57b6d17f72b7b48df546 (diff) | |
| download | frameworks_av-4e3c2bbc65e03f9515d56dfc079c507aac08a69e.zip frameworks_av-4e3c2bbc65e03f9515d56dfc079c507aac08a69e.tar.gz frameworks_av-4e3c2bbc65e03f9515d56dfc079c507aac08a69e.tar.bz2 | |
am 7e45789f: Fix overload of SoftVideoDecoderOMXComponent::updatePortDefinitions
* commit '7e45789f5fbcbe68075f57b6d17f72b7b48df546':
Fix overload of SoftVideoDecoderOMXComponent::updatePortDefinitions
| -rw-r--r-- | media/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp | 4 | ||||
| -rw-r--r-- | media/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/media/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp b/media/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp index e399984..246069b 100644 --- a/media/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp +++ b/media/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.cpp @@ -353,8 +353,8 @@ void SoftMPEG4::onReset() { } } -void SoftMPEG4::updatePortDefinitions() { - SoftVideoDecoderOMXComponent::updatePortDefinitions(); +void SoftMPEG4::updatePortDefinitions(bool updateCrop) { + SoftVideoDecoderOMXComponent::updatePortDefinitions(updateCrop); /* We have to align our width and height - this should affect stride! */ OMX_PARAM_PORTDEFINITIONTYPE *def = &editPortInfo(kOutputPortIndex)->mDef; diff --git a/media/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.h b/media/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.h index 8a06a00..31577e2 100644 --- a/media/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.h +++ b/media/libstagefright/codecs/m4v_h263/dec/SoftMPEG4.h @@ -66,7 +66,7 @@ private: status_t initDecoder(); - virtual void updatePortDefinitions(); + virtual void updatePortDefinitions(bool updateCrop = true); bool handlePortSettingsChange(); DISALLOW_EVIL_CONSTRUCTORS(SoftMPEG4); |