Ticket #4925: attempt_resolve_crashes_after_removing_streams.diff

libmythtv/avformatdecoder.cpp

@@ -1994 +1994 @@
         AVStream *st = ic->streams[i];
         if (st->codec->codec_type == CODEC_TYPE_AUDIO)
         {
+            avcodec_flush_buffers(st->codec);
             av_remove_stream(ic, st->id, 0);
             i--;
         }
         else
             i++;
     }
-    av_read_frame_flush(ic);
 }
 
 void release_avf_buffer(struct AVCodecContext *c, AVFrame *pic)

libavcodec/utils.c

@@ -1269 +1269 @@
 
 void avcodec_flush_buffers(AVCodecContext *avctx)
 {
-    if(avctx->codec->flush)
+    if(avctx->codec && avctx->codec->flush)
         avctx->codec->flush(avctx);
 }
 

libavformat/utils.c

@@ -581 +581 @@
     *pnum = 0;
     *pden = 0;
 
-    if (!st || !st->codec)
+    if (!st || !st->codec || !pc)
         return;
     
     switch(st->codec->codec_type) {
@@ -690 +690 @@
     }
 
     /* do we have a video B frame ? */
-    delay= st->codec->has_b_frames;
+    delay= (pc) ? st->codec->has_b_frames : 0;
     presentation_delayed = 0;
     /* XXX: need has_b_frame, but cannot get it if the codec is
         not initialized */
@@ -765 +765 @@
 //    av_log(NULL, AV_LOG_ERROR, "OUTdelayed:%d/%d pts:%"PRId64", dts:%"PRId64" cur_dts:%"PRId64"\n", presentation_delayed, delay, pkt->pts, pkt->dts, st->cur_dts);
 
     /* update flags */
-    if(is_intra_only(st->codec))
+    if(pc && is_intra_only(st->codec))
         pkt->flags |= PKT_FLAG_KEY;
     else if (pc) {
         pkt->flags = 0;