ffmpeg source update for sep 09

source/patched-ffmpeg-mt/libavformat/avidec.c

 /*
  * AVI demuxer
  * Copyright (c) 2001 Fabrice Bellard
  *
  * This file is part of FFmpeg.
  *
  * FFmpeg is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
@@ skipping 741 matching lines @@
     int64_t ts, next_ts, ts_min = INT64_MAX;
     AVStream *st, *sub_st = NULL;
     int i;
 
     next_ts = av_rescale_q(next_ast->frame_offset, next_st->time_base,
                            AV_TIME_BASE_Q);
 
     for (i=0; i<s->nb_streams; i++) {
         st  = s->streams[i];
         ast = st->priv_data;
-        if (st->discard < AVDISCARD_ALL && ast->sub_pkt.data) {
+        if (st->discard < AVDISCARD_ALL && ast && ast->sub_pkt.data) {
             ts = av_rescale_q(ast->sub_pkt.dts, st->time_base, AV_TIME_BASE_Q);
             if (ts <= next_ts && ts < ts_min) {
                 ts_min = ts;
                 sub_st = st;
             }
         }
     }
 
     if (sub_st) {
         ast = sub_st->priv_data;
@@ skipping 514 matching lines @@
 
 static int avi_read_close(AVFormatContext *s)
 {
     int i;
     AVIContext *avi = s->priv_data;
 
     for(i=0;i<s->nb_streams;i++) {
         AVStream *st = s->streams[i];
         AVIStream *ast = st->priv_data;
         av_free(st->codec->palctrl);
-        if (ast->sub_ctx) {
-            av_freep(&ast->sub_ctx->pb);
-            av_close_input_stream(ast->sub_ctx);
+        if (ast) {
+            if (ast->sub_ctx) {
+                av_freep(&ast->sub_ctx->pb);
+                av_close_input_stream(ast->sub_ctx);
+            }
+            av_free(ast->sub_buffer);
+            av_free_packet(&ast->sub_pkt);
         }
-        av_free(ast->sub_buffer);
-        av_free_packet(&ast->sub_pkt);
     }
 
     if (avi->dv_demux)
         av_free(avi->dv_demux);
 
     return 0;
 }
 
 static int avi_probe(AVProbeData *p)
 {
@@ skipping 12 matching lines @@
     "avi",
     NULL_IF_CONFIG_SMALL("AVI format"),
     sizeof(AVIContext),
     avi_probe,
     avi_read_header,
     avi_read_packet,
     avi_read_close,
     avi_read_seek,
     .metadata_conv = ff_avi_metadata_conv,
 };