[FFmpeg-cvslog] mov: Allow last 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| [a294a7a1b3c1c797d5ea206359df35acfb977834] | committer: Alex Converse

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

Fixes ticket #673.
(cherry picked from commit 8dcd2a41ecff8cc1e9b20cc267df54c59878ab3b)

Signed-off-by: Alex Converse <alex.converse at gmail.com>

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

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

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 701a1c1..7b21423 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -1821,7 +1821,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;
             }