RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-05-25 18:38:49 +02:00
parent 7e03886bbb
commit 5292dac34c
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/isom.h
View File

@ -110,7 +110,7 @@ typedef struct MOVStreamContext {
int ctts_index; int ctts_index;
int ctts_sample; int ctts_sample;
unsigned int sample_size; ///< may contain value calculated from stsd or value from stsz atom 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; unsigned int sample_count;
int *sample_sizes; int *sample_sizes;
int keyframe_absent; int keyframe_absent;

4
libavformat/mov.c
View File

@ -1721,7 +1721,7 @@ static int mov_read_stsz(MOVContext *c, AVIOContext *pb, MOVAtom atom)
sample_size = avio_rb32(pb); sample_size = avio_rb32(pb);
if (!sc->sample_size) /* do not overwrite value computed in stsd */ if (!sc->sample_size) /* do not overwrite value computed in stsd */
sc->sample_size = sample_size; sc->sample_size = sample_size;
sc->alt_sample_size = sample_size; sc->stsz_sample_size = sample_size;
field_size = 32; field_size = 32;
} else { } else {
sample_size = 0; sample_size = 0;
@ -2018,7 +2018,7 @@ static void mov_build_index(MOVContext *mov, AVStream *st)
} }
if (keyframe) if (keyframe)
distance = 0; 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 || if (sc->pseudo_stream_id == -1 ||
sc->stsc_data[stsc_index].id - 1 == sc->pseudo_stream_id) { sc->stsc_data[stsc_index].id - 1 == sc->pseudo_stream_id) {
AVIndexEntry *e = &st->index_entries[st->nb_index_entries++]; AVIndexEntry *e = &st->index_entries[st->nb_index_entries++];