From 3b3bbdd3e63a3a1eaf69b861f72cf74f1669afe1 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sat, 18 Jun 2011 11:43:24 +0200 Subject: lavf,lavd: replace av_new_stream->avformat_new_stream part I. Trivial replacements with sed are done in this commit: sed 's/av_new_stream(\([^)]*\), 0)/avformat_new_stream(\1, NULL)/' --- libavdevice/alsa-audio-dec.c | 2 +- libavdevice/bktr.c | 2 +- libavdevice/fbdev.c | 2 +- libavdevice/jack_audio.c | 2 +- libavdevice/libcdio.c | 2 +- libavdevice/libdc1394.c | 2 +- libavdevice/oss_audio.c | 2 +- libavdevice/sndio_dec.c | 2 +- libavdevice/v4l.c | 2 +- libavdevice/v4l2.c | 2 +- libavdevice/vfwcap.c | 2 +- libavdevice/x11grab.c | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) (limited to 'libavdevice') diff --git a/libavdevice/alsa-audio-dec.c b/libavdevice/alsa-audio-dec.c index 0ee6b0196e..1346016254 100644 --- a/libavdevice/alsa-audio-dec.c +++ b/libavdevice/alsa-audio-dec.c @@ -60,7 +60,7 @@ static av_cold int audio_read_header(AVFormatContext *s1, enum CodecID codec_id; snd_pcm_sw_params_t *sw_params; - st = av_new_stream(s1, 0); + st = avformat_new_stream(s1, NULL); if (!st) { av_log(s1, AV_LOG_ERROR, "Cannot add stream\n"); diff --git a/libavdevice/bktr.c b/libavdevice/bktr.c index a2513a729d..8dd4e3ae0a 100644 --- a/libavdevice/bktr.c +++ b/libavdevice/bktr.c @@ -271,7 +271,7 @@ static int grab_read_header(AVFormatContext *s1, AVFormatParameters *ap) goto out; } - st = av_new_stream(s1, 0); + st = avformat_new_stream(s1, NULL); if (!st) { ret = AVERROR(ENOMEM); goto out; diff --git a/libavdevice/fbdev.c b/libavdevice/fbdev.c index 099a486b9b..ddace67392 100644 --- a/libavdevice/fbdev.c +++ b/libavdevice/fbdev.c @@ -108,7 +108,7 @@ av_cold static int fbdev_read_header(AVFormatContext *avctx, return ret; } - if (!(st = av_new_stream(avctx, 0))) + if (!(st = avformat_new_stream(avctx, NULL))) return AVERROR(ENOMEM); av_set_pts_info(st, 64, 1, 1000000); /* 64 bits pts in microseconds */ diff --git a/libavdevice/jack_audio.c b/libavdevice/jack_audio.c index 7b39b41b96..4907e82395 100644 --- a/libavdevice/jack_audio.c +++ b/libavdevice/jack_audio.c @@ -229,7 +229,7 @@ static int audio_read_header(AVFormatContext *context, AVFormatParameters *param if ((test = start_jack(context))) return test; - stream = av_new_stream(context, 0); + stream = avformat_new_stream(context, NULL); if (!stream) { stop_jack(self); return AVERROR(ENOMEM); diff --git a/libavdevice/libcdio.c b/libavdevice/libcdio.c index 9ea7780ef3..bade74e5f0 100644 --- a/libavdevice/libcdio.c +++ b/libavdevice/libcdio.c @@ -53,7 +53,7 @@ static av_cold int read_header(AVFormatContext *ctx, AVFormatParameters *ap) int ret, i; char *err = NULL; - if (!(st = av_new_stream(ctx, 0))) + if (!(st = avformat_new_stream(ctx, NULL))) return AVERROR(ENOMEM); s->drive = cdio_cddap_identify(ctx->filename, CDDA_MESSAGE_LOGIT, &err); if (!s->drive) { diff --git a/libavdevice/libdc1394.c b/libavdevice/libdc1394.c index 5ccf816fed..bca014fe3c 100644 --- a/libavdevice/libdc1394.c +++ b/libavdevice/libdc1394.c @@ -160,7 +160,7 @@ static inline int dc1394_read_common(AVFormatContext *c, AVFormatParameters *ap, } /* create a video stream */ - vst = av_new_stream(c, 0); + vst = avformat_new_stream(c, NULL); if (!vst) { ret = AVERROR(ENOMEM); goto out; diff --git a/libavdevice/oss_audio.c b/libavdevice/oss_audio.c index 167dd6c185..01d944a163 100644 --- a/libavdevice/oss_audio.c +++ b/libavdevice/oss_audio.c @@ -209,7 +209,7 @@ static int audio_read_header(AVFormatContext *s1, AVFormatParameters *ap) AVStream *st; int ret; - st = av_new_stream(s1, 0); + st = avformat_new_stream(s1, NULL); if (!st) { return AVERROR(ENOMEM); } diff --git a/libavdevice/sndio_dec.c b/libavdevice/sndio_dec.c index 629a88dfd4..ca11661f09 100644 --- a/libavdevice/sndio_dec.c +++ b/libavdevice/sndio_dec.c @@ -34,7 +34,7 @@ static av_cold int audio_read_header(AVFormatContext *s1, AVStream *st; int ret; - st = av_new_stream(s1, 0); + st = avformat_new_stream(s1, NULL); if (!st) return AVERROR(ENOMEM); diff --git a/libavdevice/v4l.c b/libavdevice/v4l.c index 71771d6e4d..5fc91d37be 100644 --- a/libavdevice/v4l.c +++ b/libavdevice/v4l.c @@ -98,7 +98,7 @@ static int grab_read_header(AVFormatContext *s1, AVFormatParameters *ap) s->video_win.width = ap->width; s->video_win.height = ap->height; - st = av_new_stream(s1, 0); + st = avformat_new_stream(s1, NULL); if (!st) return AVERROR(ENOMEM); av_set_pts_info(st, 64, 1, 1000000); /* 64 bits pts in us */ diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c index 735d803fdd..59b1e55bd8 100644 --- a/libavdevice/v4l2.c +++ b/libavdevice/v4l2.c @@ -580,7 +580,7 @@ static int v4l2_read_header(AVFormatContext *s1, AVFormatParameters *ap) enum CodecID codec_id; enum PixelFormat pix_fmt = PIX_FMT_NONE; - st = av_new_stream(s1, 0); + st = avformat_new_stream(s1, NULL); if (!st) { res = AVERROR(ENOMEM); goto out; diff --git a/libavdevice/vfwcap.c b/libavdevice/vfwcap.c index 61b038323c..6f11914935 100644 --- a/libavdevice/vfwcap.c +++ b/libavdevice/vfwcap.c @@ -295,7 +295,7 @@ static int vfw_read_header(AVFormatContext *s, AVFormatParameters *ap) SetWindowLongPtr(ctx->hwnd, GWLP_USERDATA, (LONG_PTR) s); - st = av_new_stream(s, 0); + st = avformat_new_stream(s, NULL); if(!st) { vfw_read_close(s); return AVERROR(ENOMEM); diff --git a/libavdevice/x11grab.c b/libavdevice/x11grab.c index 14232ed0b7..7874b81908 100644 --- a/libavdevice/x11grab.c +++ b/libavdevice/x11grab.c @@ -193,7 +193,7 @@ x11grab_read_header(AVFormatContext *s1, AVFormatParameters *ap) goto out; } - st = av_new_stream(s1, 0); + st = avformat_new_stream(s1, NULL); if (!st) { ret = AVERROR(ENOMEM); goto out; -- cgit v1.2.3