Commit 0e5ecd80 authored by Clément Bœsch's avatar Clément Bœsch

Replace remaining av_new_stream() with avformat_new_stream().

parent 454f1657
...@@ -64,11 +64,12 @@ static AVStream *add_audio_stream(AVFormatContext *oc, enum CodecID codec_id) ...@@ -64,11 +64,12 @@ static AVStream *add_audio_stream(AVFormatContext *oc, enum CodecID codec_id)
AVCodecContext *c; AVCodecContext *c;
AVStream *st; AVStream *st;
st = av_new_stream(oc, 1); st = avformat_new_stream(oc, NULL);
if (!st) { if (!st) {
fprintf(stderr, "Could not alloc stream\n"); fprintf(stderr, "Could not alloc stream\n");
exit(1); exit(1);
} }
st->id = 1;
c = st->codec; c = st->codec;
c->codec_id = codec_id; c->codec_id = codec_id;
......
...@@ -659,11 +659,12 @@ dshow_add_device(AVFormatContext *avctx, AVFormatParameters *ap, ...@@ -659,11 +659,12 @@ dshow_add_device(AVFormatContext *avctx, AVFormatParameters *ap,
AVStream *st; AVStream *st;
int ret = AVERROR(EIO); int ret = AVERROR(EIO);
st = av_new_stream(avctx, devtype); st = avformat_new_stream(avctx, NULL);
if (!st) { if (!st) {
ret = AVERROR(ENOMEM); ret = AVERROR(ENOMEM);
goto error; goto error;
} }
st->id = devtype;
ctx->capture_filter[devtype]->stream_index = st->index; ctx->capture_filter[devtype]->stream_index = st->index;
......
...@@ -161,8 +161,9 @@ av_cold static int lavfi_read_header(AVFormatContext *avctx, ...@@ -161,8 +161,9 @@ av_cold static int lavfi_read_header(AVFormatContext *avctx,
/* for each open output create a corresponding stream */ /* for each open output create a corresponding stream */
for (i = 0, inout = output_links; inout; i++, inout = inout->next) { for (i = 0, inout = output_links; inout; i++, inout = inout->next) {
AVStream *st; AVStream *st;
if (!(st = av_new_stream(avctx, i))) if (!(st = avformat_new_stream(avctx, NULL)))
FAIL(AVERROR(ENOMEM)); FAIL(AVERROR(ENOMEM));
st->id = i;
} }
/* create a sink for each output and connect them to the graph */ /* create a sink for each output and connect them to the graph */
......
...@@ -145,7 +145,7 @@ static int read_header(AVFormatContext *ctx, AVFormatParameters *ap) ...@@ -145,7 +145,7 @@ static int read_header(AVFormatContext *ctx, AVFormatParameters *ap)
if (error = al_get_error(ad->device, &error_msg)) goto fail; if (error = al_get_error(ad->device, &error_msg)) goto fail;
/* Create stream */ /* Create stream */
if (!(st = av_new_stream(ctx, 0))) { if (!(st = avformat_new_stream(ctx, NULL))) {
error = AVERROR(ENOMEM); error = AVERROR(ENOMEM);
goto fail; goto fail;
} }
......
...@@ -69,7 +69,7 @@ static int read_header(AVFormatContext *s, ...@@ -69,7 +69,7 @@ static int read_header(AVFormatContext *s,
int min,sec,msec; int min,sec,msec;
st=av_new_stream(s, 0); st = avformat_new_stream(s, NULL);
if (!st) if (!st)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
......
...@@ -102,7 +102,7 @@ static AVStream * init_stream(AVFormatContext *s, ...@@ -102,7 +102,7 @@ static AVStream * init_stream(AVFormatContext *s,
AVFormatParameters *ap) AVFormatParameters *ap)
{ {
BinDemuxContext *bin = s->priv_data; BinDemuxContext *bin = s->priv_data;
AVStream *st = av_new_stream(s, 0); AVStream *st = avformat_new_stream(s, NULL);
if (!st) if (!st)
return NULL; return NULL;
st->codec->codec_tag = 0; st->codec->codec_tag = 0;
......
...@@ -32,7 +32,7 @@ static int g723_1_init(AVFormatContext *s, AVFormatParameters *ap) ...@@ -32,7 +32,7 @@ static int g723_1_init(AVFormatContext *s, AVFormatParameters *ap)
{ {
AVStream *st; AVStream *st;
st = av_new_stream(s, 0); st = avformat_new_stream(s, NULL);
if (!st) if (!st)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
......
...@@ -217,7 +217,7 @@ static int modplug_read_header(AVFormatContext *s, AVFormatParameters *ap) ...@@ -217,7 +217,7 @@ static int modplug_read_header(AVFormatContext *s, AVFormatParameters *ap)
if (!modplug->f) if (!modplug->f)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
st = av_new_stream(s, 0); st = avformat_new_stream(s, NULL);
if (!st) if (!st)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
av_set_pts_info(st, 64, 1, 1000); av_set_pts_info(st, 64, 1, 1000);
...@@ -231,7 +231,7 @@ static int modplug_read_header(AVFormatContext *s, AVFormatParameters *ap) ...@@ -231,7 +231,7 @@ static int modplug_read_header(AVFormatContext *s, AVFormatParameters *ap)
modplug->ts_per_packet = 1000*AUDIO_PKT_SIZE / (4*44100.); modplug->ts_per_packet = 1000*AUDIO_PKT_SIZE / (4*44100.);
if (modplug->video_stream) { if (modplug->video_stream) {
AVStream *vst = av_new_stream(s, 1); AVStream *vst = avformat_new_stream(s, NULL);
if (!vst) if (!vst)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
av_set_pts_info(vst, 64, 1, 1000); av_set_pts_info(vst, 64, 1, 1000);
......
...@@ -63,7 +63,7 @@ static int loas_read_header(AVFormatContext *s, ...@@ -63,7 +63,7 @@ static int loas_read_header(AVFormatContext *s,
{ {
AVStream *st; AVStream *st;
st = av_new_stream(s, 0); st = avformat_new_stream(s, NULL);
if (!st) if (!st)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
......
...@@ -54,7 +54,7 @@ static int microdvd_read_header(AVFormatContext *s, AVFormatParameters *ap) ...@@ -54,7 +54,7 @@ static int microdvd_read_header(AVFormatContext *s, AVFormatParameters *ap)
{ {
AVRational pts_info = (AVRational){ 2997, 125 }; /* default: 23.976 fps */ AVRational pts_info = (AVRational){ 2997, 125 }; /* default: 23.976 fps */
MicroDVDContext *microdvd = s->priv_data; MicroDVDContext *microdvd = s->priv_data;
AVStream *st = av_new_stream(s, 0); AVStream *st = avformat_new_stream(s, NULL);
int i, frame; int i, frame;
double fps; double fps;
char c; char c;
......
...@@ -47,7 +47,7 @@ static int pmp_header(AVFormatContext *s, AVFormatParameters *ap) { ...@@ -47,7 +47,7 @@ static int pmp_header(AVFormatContext *s, AVFormatParameters *ap) {
int srate, channels; int srate, channels;
int i; int i;
uint64_t pos; uint64_t pos;
AVStream *vst = av_new_stream(s, 0); AVStream *vst = avformat_new_stream(s, NULL);
if (!vst) if (!vst)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
vst->codec->codec_type = AVMEDIA_TYPE_VIDEO; vst->codec->codec_type = AVMEDIA_TYPE_VIDEO;
...@@ -90,9 +90,10 @@ static int pmp_header(AVFormatContext *s, AVFormatParameters *ap) { ...@@ -90,9 +90,10 @@ static int pmp_header(AVFormatContext *s, AVFormatParameters *ap) {
srate = avio_rl32(pb); srate = avio_rl32(pb);
channels = avio_rl32(pb) + 1; channels = avio_rl32(pb) + 1;
for (i = 1; i < pmp->num_streams; i++) { for (i = 1; i < pmp->num_streams; i++) {
AVStream *ast = av_new_stream(s, i); AVStream *ast = avformat_new_stream(s, NULL);
if (!ast) if (!ast)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
ast->id = i;
ast->codec->codec_type = AVMEDIA_TYPE_AUDIO; ast->codec->codec_type = AVMEDIA_TYPE_AUDIO;
ast->codec->codec_id = audio_codec_id; ast->codec->codec_id = audio_codec_id;
ast->codec->channels = channels; ast->codec->channels = channels;
......
...@@ -485,10 +485,11 @@ static int wav_read_header(AVFormatContext *s, ...@@ -485,10 +485,11 @@ static int wav_read_header(AVFormatContext *s,
goto break_loop; goto break_loop;
} }
av_log(s, AV_LOG_DEBUG, "Found SMV data\n"); av_log(s, AV_LOG_DEBUG, "Found SMV data\n");
vst = av_new_stream(s, 1); vst = avformat_new_stream(s, NULL);
if (!vst) if (!vst)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
avio_r8(pb); avio_r8(pb);
vst->id = 1;
vst->codec->codec_type = AVMEDIA_TYPE_VIDEO; vst->codec->codec_type = AVMEDIA_TYPE_VIDEO;
vst->codec->codec_id = CODEC_ID_MJPEG; vst->codec->codec_id = CODEC_ID_MJPEG;
vst->codec->width = avio_rl24(pb); vst->codec->width = avio_rl24(pb);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment