Browse Source

lavf/oggdec: simplify destroying streams with chained audio streams.

nstreams is assumed to be 1 at that point, so the loop is pointless.
tags/n1.0
Clément Bœsch 13 years ago
parent
commit
edca80387c
1 changed files with 3 additions and 6 deletions
  1. +3
    -6
      libavformat/oggdec.c

+ 3
- 6
libavformat/oggdec.c View File

@@ -256,18 +256,15 @@ static int ogg_read_page(AVFormatContext *s, int *sid)
idx = ogg_find_stream (ogg, serial); idx = ogg_find_stream (ogg, serial);
if (idx < 0){ if (idx < 0){
if (ogg->headers) { if (ogg->headers) {
int n;


if (ogg->nstreams != 1) { if (ogg->nstreams != 1) {
av_log_missing_feature(s, "Changing stream parameters in multistream ogg is", 0); av_log_missing_feature(s, "Changing stream parameters in multistream ogg is", 0);
return idx; return idx;
} }


for (n = 0; n < ogg->nstreams; n++) {
av_freep(&ogg->streams[n].buf);
if (!ogg->state || ogg->state->streams[n].private != ogg->streams[n].private)
av_freep(&ogg->streams[n].private);
}
av_freep(&ogg->streams[0].buf);
if (!ogg->state || ogg->state->streams[0].private != ogg->streams[0].private)
av_freep(&ogg->streams[0].private);
ogg->curidx = -1; ogg->curidx = -1;
ogg->nstreams = 0; ogg->nstreams = 0;
idx = ogg_new_stream(s, serial, 0); idx = ogg_new_stream(s, serial, 0);


Loading…
Cancel
Save