avformat/dashenc: Remove deprecated min_seg_duration option

[ffmpeg] / libavformat / ipmovie.c

diff --git a/libavformat/ipmovie.c b/libavformat/ipmovie.c
index f1cc30b6c08d2063d175e4815ae420725394d180..9118d7d807bfb5e02be5f7c9cb27ebcb37499d49 100644 (file)
--- a/libavformat/ipmovie.c
+++ b/libavformat/ipmovie.c
@@ -608,7 +608,6 @@ static int ipmovie_read_header(AVFormatContext *s)
 {
     IPMVEContext *ipmovie = s->priv_data;
     AVIOContext *pb = s->pb;
-    AVPacket pkt;
     AVStream *st;
     unsigned char chunk_preamble[CHUNK_PREAMBLE_SIZE];
     int chunk_type, i;
@@ -623,13 +622,6 @@ static int ipmovie_read_header(AVFormatContext *s)
         if (avio_feof(pb))
             return AVERROR_EOF;
     }
-    /* initialize private context members */
-    ipmovie->video_pts = ipmovie->audio_frame_count = 0;
-    ipmovie->audio_chunk_offset = ipmovie->video_chunk_offset =
-    ipmovie->decode_map_chunk_offset = ipmovie->skip_map_chunk_offset = 0;
-    ipmovie->decode_map_chunk_size = ipmovie->video_chunk_size =
-    ipmovie->skip_map_chunk_size = 0;
-    ipmovie->send_buffer = ipmovie->frame_format = 0;
 
     /* on the first read, this will position the stream at the first chunk */
     ipmovie->next_chunk_offset = avio_tell(pb) + 4;
@@ -652,8 +644,7 @@ static int ipmovie_read_header(AVFormatContext *s)
 
     if (chunk_type == CHUNK_VIDEO)
         ipmovie->audio_type = AV_CODEC_ID_NONE;  /* no audio */
-    else if (process_ipmovie_chunk(ipmovie, pb, &pkt) != CHUNK_INIT_AUDIO) {
-        av_packet_unref(&pkt);
+    else if (process_ipmovie_chunk(ipmovie, pb, s->internal->parse_pkt) != CHUNK_INIT_AUDIO) {
         return AVERROR_INVALIDDATA;
     }
 
@@ -686,27 +677,27 @@ static int ipmovie_read_packet(AVFormatContext *s,
     int ret;
 
     for (;;) {
-    ret = process_ipmovie_chunk(ipmovie, pb, pkt);
+        ret = process_ipmovie_chunk(ipmovie, pb, pkt);
         /* dispatch the first of any pending packets */
         if ((ret == CHUNK_VIDEO) || (ret == CHUNK_AUDIO_ONLY))
             ret = load_ipmovie_packet(ipmovie, pb, pkt);
 
-    if (ret == CHUNK_BAD)
-        ret = AVERROR_INVALIDDATA;
-    else if (ret == CHUNK_EOF)
-        ret = AVERROR(EIO);
-    else if (ret == CHUNK_NOMEM)
-        ret = AVERROR(ENOMEM);
-    else if (ret == CHUNK_END || ret == CHUNK_SHUTDOWN)
-        ret = AVERROR_EOF;
-    else if (ret == CHUNK_HAVE_PACKET)
-        ret = 0;
-    else if (ret == CHUNK_INIT_VIDEO || ret == CHUNK_INIT_AUDIO)
-        continue;
-    else
-        continue;
-
-    return ret;
+        if (ret == CHUNK_BAD)
+            ret = AVERROR_INVALIDDATA;
+        else if (ret == CHUNK_EOF)
+            ret = AVERROR(EIO);
+        else if (ret == CHUNK_NOMEM)
+            ret = AVERROR(ENOMEM);
+        else if (ret == CHUNK_END || ret == CHUNK_SHUTDOWN)
+            ret = AVERROR_EOF;
+        else if (ret == CHUNK_HAVE_PACKET)
+            ret = 0;
+        else if (ret == CHUNK_INIT_VIDEO || ret == CHUNK_INIT_AUDIO)
+            continue;
+        else
+            continue;
+
+        return ret;
     }
 }