| commit | 5ddfbe7a9c530f70582dc788c9b198d892be3950 | [log] [tgz] |
|---|---|---|
| author | James Dong <jdong@google.com> | Mon Jan 23 19:03:59 2012 -0800 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Jan 23 19:03:59 2012 -0800 |
| tree | a3fa69f6ded5290c1d01012972b79bbbdbddfda3 | |
| parent | eedda3071755b2dcf851bca8bed610de18a91d01 [diff] | |
| parent | 727f9e1e8e1306af761765e480ac5499224db646 [diff] |
Merge "AudioPlayerBase and VideoEditorAudioPlayer class design is incorrect."
diff --git a/libvideoeditor/vss/mcs/src/M4MCS_API.c b/libvideoeditor/vss/mcs/src/M4MCS_API.c index d75a495..3844630 100755 --- a/libvideoeditor/vss/mcs/src/M4MCS_API.c +++ b/libvideoeditor/vss/mcs/src/M4MCS_API.c
@@ -8866,7 +8866,7 @@ } - if ((pC->EncodingVideoFormat = M4ENCODER_kNULL) + if ((pC->EncodingVideoFormat == M4ENCODER_kNULL) && (pC->bLastDecodedFrameCTS == M4OSA_FALSE) && (pC->uiBeginCutTime > 0)) {