summaryrefslogtreecommitdiff
path: root/libavformat/avisynth.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2011-06-18 11:43:24 +0200
committerAnton Khirnov <anton@khirnov.net>2011-10-19 17:02:11 +0200
commit84ad31ff180fa089cd6bfd93c246336a16036455 (patch)
tree13dfd7e1445d6eafda50c6e3dd98030f464579af /libavformat/avisynth.c
parent3b3bbdd3e63a3a1eaf69b861f72cf74f1669afe1 (diff)
lavf: replace av_new_stream->avformat_new_stream part II.
Manual replacements are done in this commit. In many cases, the id is some constant made up number (e.g. 0 for video and 1 for audio), which is then not used in the demuxer for anything. Those ids are removed.
Diffstat (limited to 'libavformat/avisynth.c')
-rw-r--r--libavformat/avisynth.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/libavformat/avisynth.c b/libavformat/avisynth.c
index b615796116..78eb5e6025 100644
--- a/libavformat/avisynth.c
+++ b/libavformat/avisynth.c
@@ -84,7 +84,8 @@ static int avisynth_read_header(AVFormatContext *s, AVFormatParameters *ap)
if (AVIStreamReadFormat(stream->handle, 0, &wvfmt, &struct_size) != S_OK)
continue;
- st = av_new_stream(s, id);
+ st = avformat_new_stream(s, NULL);
+ st->id = id;
st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
st->codec->block_align = wvfmt.nBlockAlign;
@@ -110,7 +111,8 @@ static int avisynth_read_header(AVFormatContext *s, AVFormatParameters *ap)
if (AVIStreamReadFormat(stream->handle, 0, &imgfmt, &struct_size) != S_OK)
continue;
- st = av_new_stream(s, id);
+ st = avformat_new_stream(s, NULL);
+ st->id = id;
st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
st->r_frame_rate.num = stream->info.dwRate;
st->r_frame_rate.den = stream->info.dwScale;