diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-06-18 11:43:24 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-10-19 17:02:11 +0200 |
| commit | 84ad31ff180fa089cd6bfd93c246336a16036455 (patch) | |
| tree | 13dfd7e1445d6eafda50c6e3dd98030f464579af /libavformat/sapdec.c | |
| parent | 3b3bbdd3e63a3a1eaf69b861f72cf74f1669afe1 (diff) | |
| download | ffmpeg-84ad31ff180fa089cd6bfd93c246336a16036455.tar.gz | |
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/sapdec.c')
| -rw-r--r-- | libavformat/sapdec.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavformat/sapdec.c b/libavformat/sapdec.c index c317821772..84a9eb17b3 100644 --- a/libavformat/sapdec.c +++ b/libavformat/sapdec.c @@ -163,11 +163,12 @@ static int sap_read_header(AVFormatContext *s, if (sap->sdp_ctx->ctx_flags & AVFMTCTX_NOHEADER) s->ctx_flags |= AVFMTCTX_NOHEADER; for (i = 0; i < sap->sdp_ctx->nb_streams; i++) { - AVStream *st = av_new_stream(s, i); + AVStream *st = avformat_new_stream(s, NULL); if (!st) { ret = AVERROR(ENOMEM); goto fail; } + st->id = i; avcodec_copy_context(st->codec, sap->sdp_ctx->streams[i]->codec); st->time_base = sap->sdp_ctx->streams[i]->time_base; } @@ -211,11 +212,12 @@ static int sap_fetch_packet(AVFormatContext *s, AVPacket *pkt) if (s->ctx_flags & AVFMTCTX_NOHEADER) { while (sap->sdp_ctx->nb_streams > s->nb_streams) { int i = s->nb_streams; - AVStream *st = av_new_stream(s, i); + AVStream *st = avformat_new_stream(s, NULL); if (!st) { av_free_packet(pkt); return AVERROR(ENOMEM); } + st->id = i; avcodec_copy_context(st->codec, sap->sdp_ctx->streams[i]->codec); st->time_base = sap->sdp_ctx->streams[i]->time_base; } |