Originally committed as revision 2109 to svn://svn.ffmpeg.org/ffmpeg/trunk
}
/* now we are ready: build format streams */
}
/* now we are ready: build format streams */
- st = av_malloc(sizeof(AVStream));
+ st = av_new_stream(s, 0);
- avcodec_get_context_defaults(&st->codec);
-
- s->nb_streams = 1;
- s->streams[0] = st;
-
- st->id = 0;
-
st->codec.codec_type = CODEC_TYPE_AUDIO;
st->codec.codec_tag = id;
st->codec.codec_id = codec;
st->codec.codec_type = CODEC_TYPE_AUDIO;
st->codec.codec_tag = id;
st->codec.codec_id = codec;
FFMStream *fst;
ByteIOContext *pb = &s->pb;
AVCodecContext *codec;
FFMStream *fst;
ByteIOContext *pb = &s->pb;
AVCodecContext *codec;
uint32_t tag;
/* header */
uint32_t tag;
/* header */
ffm->file_size = (uint64_t_C(1) << 63) - 1;
}
ffm->file_size = (uint64_t_C(1) << 63) - 1;
}
- s->nb_streams = get_be32(pb);
+ nb_streams = get_be32(pb);
get_be32(pb); /* total bitrate */
/* read each stream */
get_be32(pb); /* total bitrate */
/* read each stream */
- for(i=0;i<s->nb_streams;i++) {
+ for(i=0;i<nb_streams;i++) {
- st = av_mallocz(sizeof(AVStream));
+ st = av_new_stream(s, 0);
- avcodec_get_context_defaults(&st->codec);
- s->streams[i] = st;
fst = av_mallocz(sizeof(FFMStream));
if (!fst)
goto fail;
fst = av_mallocz(sizeof(FFMStream));
if (!fst)
goto fail;
read(fd, buf, 8);
pos = 0;
for(i=0;i<8;i++)
read(fd, buf, 8);
pos = 0;
for(i=0;i<8;i++)
- pos |= buf[i] << (56 - i * 8);
+ pos |= (int64_t)buf[i] << (56 - i * 8);
get_le16(pb);
/* if mp3 streaming found, OK */
if ((v & 0x20) != 0) {
get_le16(pb);
/* if mp3 streaming found, OK */
if ((v & 0x20) != 0) {
- st = av_mallocz(sizeof(AVStream));
+ st = av_new_stream(s, 0);
- avcodec_get_context_defaults(&st->codec);
if (v & 0x01)
st->codec.channels = 2;
else
st->codec.channels = 1;
if (v & 0x01)
st->codec.channels = 2;
else
st->codec.channels = 1;
- s->nb_streams = 1;
- s->streams[0] = st;
switch((v>> 2) & 0x03) {
case 1:
switch((v>> 2) & 0x03) {
case 1: