commit 621c8ebda30e27603a512b6d56e583ee201b447a
author James Dong <jdong@google.com> Mon Sep 17 10:28:45 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Sep 17 10:28:45 2012 -0700
tree 0c7f07428cf03a49f17cf8eea6ed6773c5becb3a
parent fac9b61a05e2143c877474ce3e2a3a47803ed799
parent 40be070922721b285a9436ec49e5d438ba322133

am 40be0709: am dcd76da5: Merge "Make a small correction in terms of GOP structure in the recorded video" into jb-mr1-dev

* commit '40be070922721b285a9436ec49e5d438ba322133':
  Make a small correction in terms of GOP structure in the recorded video

media/libstagefright/OMXCodec.cpp

diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp
index 233a733..07f92c7 100755
--- a/media/libstagefright/OMXCodec.cpp
+++ b/media/libstagefright/OMXCodec.cpp
@@ -890,7 +890,7 @@
     } else if (iFramesInterval == 0) {
         return 0;
     }
-    OMX_U32 ret = frameRate * iFramesInterval;
+    OMX_U32 ret = frameRate * iFramesInterval - 1;
     CHECK(ret > 1);
     return ret;
 }