virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-29 22:00:58 +02:00
Code Issues Releases Activity

move parameters reset after setting stream parameters, will need those infos

Browse Source 
Originally committed as revision 12229 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Baptiste Coudurier 2008-02-26 14:31:36 +00:00
parent 042e0adda9
commit f296563e5f
1 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
libavformat/mov.c
View File

@ -805,27 +805,6 @@ static int mov_read_stsd(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
/* special codec parameters handling */ /* special codec parameters handling */
switch (st->codec->codec_id) { switch (st->codec->codec_id) {
#ifdef CONFIG_H261_DECODER
case CODEC_ID_H261:
#endif
#ifdef CONFIG_H263_DECODER
case CODEC_ID_H263:
#endif
#ifdef CONFIG_MPEG4_DECODER
case CODEC_ID_MPEG4:
#endif
st->codec->width= 0; /* let decoder init width/height */
st->codec->height= 0;
break;
#ifdef CONFIG_LIBFAAD
case CODEC_ID_AAC:
#endif
#ifdef CONFIG_VORBIS_DECODER
case CODEC_ID_VORBIS:
#endif
case CODEC_ID_MP3ON4:
st->codec->sample_rate= 0; /* let decoder init parameters properly */
break;
#ifdef CONFIG_DV_DEMUXER #ifdef CONFIG_DV_DEMUXER
case CODEC_ID_DVAUDIO: case CODEC_ID_DVAUDIO:
c->dv_fctx = av_alloc_format_context(); c->dv_fctx = av_alloc_format_context();
@ -1472,6 +1451,30 @@ static int mov_read_header(AVFormatContext *s, AVFormatParameters *ap)
} }
sc->ffindex = i; sc->ffindex = i;
mov_build_index(mov, st); mov_build_index(mov, st);
switch (st->codec->codec_id) {
#ifdef CONFIG_H261_DECODER
case CODEC_ID_H261:
#endif
#ifdef CONFIG_H263_DECODER
case CODEC_ID_H263:
#endif
#ifdef CONFIG_MPEG4_DECODER
case CODEC_ID_MPEG4:
#endif
st->codec->width= 0; /* let decoder init width/height */
st->codec->height= 0;
break;
#ifdef CONFIG_LIBFAAD
case CODEC_ID_AAC:
#endif
#ifdef CONFIG_VORBIS_DECODER
case CODEC_ID_VORBIS:
#endif
case CODEC_ID_MP3ON4:
st->codec->sample_rate= 0; /* let decoder init parameters properly */
break;
}
} }
for(i=0; i<s->nb_streams; i++) { for(i=0; i<s->nb_streams; i++) {