[FFmpeg-cvslog] Allow last mov chunk to have an arbitrary number of samples.

[Carl Eugen Hoyos]

ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Sat Dec  3 12:29:41 2011 +0100| [8dcd2a41ecff8cc1e9b20cc267df54c59878ab3b] | committer: Carl Eugen Hoyos

Allow last mov chunk to have an arbitrary number of samples.

Fixes ticket #673.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8dcd2a41ecff8cc1e9b20cc267df54c59878ab3b
---

 libavformat/mov.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/libavformat/mov.c b/libavformat/mov.c
index e527f24..db667e9 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -1741,7 +1741,8 @@ static void mov_build_index(MOVContext *mov, AVStream *st)
             unsigned count, chunk_count;
 
             chunk_samples = sc->stsc_data[i].count;
-            if (sc->samples_per_frame && chunk_samples % sc->samples_per_frame) {
+            if (i != sc->stsc_count - 1 &&
+                sc->samples_per_frame && chunk_samples % sc->samples_per_frame) {
                 av_log(mov->fc, AV_LOG_ERROR, "error unaligned chunk\n");
                 return;
             }