[FFmpeg-cvslog] avformat/mov: Rename alt_sample_size so its name matches what it is

Michael Niedermayer git at videolan.org
Sat May 25 19:20:54 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat May 25 18:38:49 2013 +0200| [5292dac34cfa9a26b47bb0b78c246e12e873b313] | committer: Michael Niedermayer

avformat/mov: Rename alt_sample_size so its name matches what it is

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

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

diff --git a/libavformat/isom.h b/libavformat/isom.h
index 4154baf..220b2df 100644
--- a/libavformat/isom.h
+++ b/libavformat/isom.h
@@ -110,7 +110,7 @@ typedef struct MOVStreamContext {
     int ctts_index;
     int ctts_sample;
     unsigned int sample_size; ///< may contain value calculated from stsd or value from stsz atom
-    unsigned int alt_sample_size; ///< always contains sample size from stsz atom
+    unsigned int stsz_sample_size; ///< always contains sample size from stsz atom
     unsigned int sample_count;
     int *sample_sizes;
     int keyframe_absent;
diff --git a/libavformat/mov.c b/libavformat/mov.c
index d5e1f89..7048920 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -1721,7 +1721,7 @@ static int mov_read_stsz(MOVContext *c, AVIOContext *pb, MOVAtom atom)
         sample_size = avio_rb32(pb);
         if (!sc->sample_size) /* do not overwrite value computed in stsd */
             sc->sample_size = sample_size;
-        sc->alt_sample_size = sample_size;
+        sc->stsz_sample_size = sample_size;
         field_size = 32;
     } else {
         sample_size = 0;
@@ -2018,7 +2018,7 @@ static void mov_build_index(MOVContext *mov, AVStream *st)
                 }
                 if (keyframe)
                     distance = 0;
-                sample_size = sc->alt_sample_size > 0 ? sc->alt_sample_size : sc->sample_sizes[current_sample];
+                sample_size = sc->stsz_sample_size > 0 ? sc->stsz_sample_size : sc->sample_sizes[current_sample];
                 if (sc->pseudo_stream_id == -1 ||
                    sc->stsc_data[stsc_index].id - 1 == sc->pseudo_stream_id) {
                     AVIndexEntry *e = &st->index_entries[st->nb_index_entries++];



More information about the ffmpeg-cvslog mailing list