resolved conflicts for merge of fbb122bf to master

Change-Id: I607e6b11e925ba858d2a0856117e2fcb68bed963

diff --cc libvideoeditor/lvpp/VideoEditorSRC.cpp
index 194e3a6,364343a..5ea95b0
--- 1/libvideoeditor/lvpp/VideoEditorSRC.cpp
--- 2/libvideoeditor/lvpp/VideoEditorSRC.cpp
+++ b/libvideoeditor/lvpp/VideoEditorSRC.cpp
@@@ -219,8 -225,11 +225,11 @@@ status_t VideoEditorSRC::getNextBuffer(
  
              // EOS or some other error
              if (err != OK) {
 -                LOGV("EOS or some err: %d", err);
 +                ALOGV("EOS or some err: %d", err);
-                 stop();
+                 // We cannot call stop() here because stop() will release the
+                 // AudioResampler, and we are in a callback of the AudioResampler.
+                 // So just remember the fact and let read() call stop().
+                 mStopPending = true;
                  return err;
              }