RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-29 10:52:20 +00:00
Code Issues Projects Releases Wiki Activity

demux all stsd ids if codec is the same, fix premature_mov_ending.mov, closes #451

Browse Source 
Originally committed as revision 13200 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Baptiste Coudurier 2008-05-20 02:21:29 +00:00
parent 3c16e03dbc
commit 978677a779
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/mov.c
View File

@ -128,7 +128,7 @@ typedef struct MOVStreamContext {
unsigned int bytes_per_frame; unsigned int bytes_per_frame;
unsigned int samples_per_frame; unsigned int samples_per_frame;
int dv_audio_container; int dv_audio_container;
int pseudo_stream_id; int pseudo_stream_id; ///< -1 means demux all ids
int16_t audio_cid; ///< stsd audio compression id int16_t audio_cid; ///< stsd audio compression id
unsigned drefs_count; unsigned drefs_count;
MOV_dref_t *drefs; MOV_dref_t *drefs;
@ -690,6 +690,7 @@ static int mov_read_stsd(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
dref_id = get_be16(pb); dref_id = get_be16(pb);
if (st->codec->codec_tag && if (st->codec->codec_tag &&
st->codec->codec_tag != format &&
(c->fc->video_codec_id ? codec_get_id(codec_movvideo_tags, format) != c->fc->video_codec_id (c->fc->video_codec_id ? codec_get_id(codec_movvideo_tags, format) != c->fc->video_codec_id
: st->codec->codec_tag != MKTAG('j','p','e','g')) : st->codec->codec_tag != MKTAG('j','p','e','g'))
){ ){
@ -699,7 +700,7 @@ static int mov_read_stsd(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
url_fskip(pb, size - (url_ftell(pb) - start_pos)); url_fskip(pb, size - (url_ftell(pb) - start_pos));
continue; continue;
} }
sc->pseudo_stream_id= pseudo_stream_id; sc->pseudo_stream_id = st->codec->codec_tag ? -1 : pseudo_stream_id;
sc->dref_id= dref_id; sc->dref_id= dref_id;
st->codec->codec_tag = format; st->codec->codec_tag = format;
@ -1176,7 +1177,8 @@ static void mov_build_index(MOVContext *mov, AVStream *st)
dprintf(mov->fc, "AVIndex stream %d, sample %d, offset %"PRIx64", dts %"PRId64", " dprintf(mov->fc, "AVIndex stream %d, sample %d, offset %"PRIx64", dts %"PRId64", "
"size %d, distance %d, keyframe %d\n", st->index, current_sample, "size %d, distance %d, keyframe %d\n", st->index, current_sample,
current_offset, current_dts, sample_size, distance, keyframe); current_offset, current_dts, sample_size, distance, keyframe);
if(sc->sample_to_chunk[stsc_index].id - 1 == sc->pseudo_stream_id) if(sc->pseudo_stream_id == -1 ||
sc->sample_to_chunk[stsc_index].id - 1 == sc->pseudo_stream_id)
av_add_index_entry(st, current_offset, current_dts, sample_size, distance, av_add_index_entry(st, current_offset, current_dts, sample_size, distance,
keyframe ? AVINDEX_KEYFRAME : 0); keyframe ? AVINDEX_KEYFRAME : 0);
current_offset += sample_size; current_offset += sample_size;