[FFmpeg-cvslog] lavf/oggdec: simplify destroying streams with chained audio streams.

Clément Bœsch git at videolan.org
Sun Sep 16 18:34:20 CEST 2012


ffmpeg | branch: master | Clément Bœsch <ubitux at gmail.com> | Tue Aug 21 20:39:14 2012 +0200| [edca80387c70d273b2ae8e8a61a83d25378b4e16] | committer: Clément Bœsch

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

nstreams is assumed to be 1 at that point, so the loop is pointless.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=edca80387c70d273b2ae8e8a61a83d25378b4e16
---

 libavformat/oggdec.c |    9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/libavformat/oggdec.c b/libavformat/oggdec.c
index 9d27393..05aeddd 100644
--- a/libavformat/oggdec.c
+++ b/libavformat/oggdec.c
@@ -256,18 +256,15 @@ static int ogg_read_page(AVFormatContext *s, int *sid)
     idx = ogg_find_stream (ogg, serial);
     if (idx < 0){
         if (ogg->headers) {
-            int n;
 
             if (ogg->nstreams != 1) {
                 av_log_missing_feature(s, "Changing stream parameters in multistream ogg is", 0);
                 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->nstreams = 0;
             idx = ogg_new_stream(s, serial, 0);



More information about the ffmpeg-cvslog mailing list