[FFmpeg-cvslog] r14632 - trunk/libavformat/matroskadec.c
aurel
subversion
Wed Aug 6 02:17:48 CEST 2008
Author: aurel
Date: Wed Aug 6 02:17:47 2008
New Revision: 14632
Log:
matroskadec: replace matroska_queue_packet with a single call to dynarray_add
patch by Anton Khirnov wyskas _at_ gmail _dot_ com
Modified:
trunk/libavformat/matroskadec.c
Modified: trunk/libavformat/matroskadec.c
==============================================================================
--- trunk/libavformat/matroskadec.c (original)
+++ trunk/libavformat/matroskadec.c Wed Aug 6 02:17:47 2008
@@ -1268,19 +1268,6 @@ static int matroska_read_header(AVFormat
}
/*
- * Put a packet into our internal queue. Will be delivered to the
- * user/application during the next get_packet() call.
- */
-static void matroska_queue_packet(MatroskaDemuxContext *matroska, AVPacket *pkt)
-{
- matroska->packets =
- av_realloc(matroska->packets, (matroska->num_packets + 1) *
- sizeof(AVPacket *));
- matroska->packets[matroska->num_packets] = pkt;
- matroska->num_packets++;
-}
-
-/*
* Put one packet in an application-supplied AVPacket struct.
* Returns 0 on success or -1 on failure.
*/
@@ -1484,7 +1471,7 @@ static int matroska_parse_block(Matroska
+ a * (h*w / a - track->audio.pkt_cnt--), a);
pkt->pos = pos;
pkt->stream_index = st->index;
- matroska_queue_packet(matroska, pkt);
+ dynarray_add(&matroska->packets,&matroska->num_packets,pkt);
}
} else {
MatroskaTrackEncoding *encodings = track->encodings.elem;
@@ -1520,7 +1507,7 @@ static int matroska_parse_block(Matroska
pkt->pos = pos;
pkt->duration = duration;
- matroska_queue_packet(matroska, pkt);
+ dynarray_add(&matroska->packets, &matroska->num_packets, pkt);
}
if (timecode != AV_NOPTS_VALUE)
More information about the ffmpeg-cvslog
mailing list