diff options
| -rw-r--r-- | libavformat/avformat.h | 5 | ||||
| -rw-r--r-- | libavformat/utils.c | 22 |
2 files changed, 16 insertions, 11 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index c6586862e9..8479d6720f 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -22,7 +22,7 @@ #define FFMPEG_AVFORMAT_H #define LIBAVFORMAT_VERSION_MAJOR 52 -#define LIBAVFORMAT_VERSION_MINOR 18 +#define LIBAVFORMAT_VERSION_MINOR 19 #define LIBAVFORMAT_VERSION_MICRO 0 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ @@ -565,6 +565,9 @@ typedef struct AVFormatContext { * codec. */ struct AVPacketList *raw_packet_buffer; + struct AVPacketList *raw_packet_buffer_end; + + struct AVPacketList *packet_buffer_end; } AVFormatContext; typedef struct AVPacketList { diff --git a/libavformat/utils.c b/libavformat/utils.c index d1647d2a06..1d96d3c5d4 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -524,16 +524,17 @@ int av_open_input_file(AVFormatContext **ic_ptr, const char *filename, /*******************************************************/ -static AVPacket *add_to_pktbuf(AVPacketList **packet_buffer, AVPacket *pkt){ - AVPacketList *pktl; - AVPacketList **plast_pktl= packet_buffer; - - while(*plast_pktl) plast_pktl= &(*plast_pktl)->next; //FIXME maybe maintain pointer to the last? - - pktl = av_mallocz(sizeof(AVPacketList)); +static AVPacket *add_to_pktbuf(AVPacketList **packet_buffer, AVPacket *pkt, + AVPacketList **plast_pktl){ + AVPacketList *pktl = av_mallocz(sizeof(AVPacketList)); if (!pktl) return NULL; + if (*packet_buffer) + (*plast_pktl)->next = pktl; + else + *packet_buffer = pktl; + /* add the packet in the buffered packet list */ *plast_pktl = pktl; pktl->pkt= *pkt; @@ -578,7 +579,7 @@ int av_read_packet(AVFormatContext *s, AVPacket *pkt) if(!pktl && st->codec->codec_id!=CODEC_ID_PROBE) return ret; - add_to_pktbuf(&s->raw_packet_buffer, pkt); + add_to_pktbuf(&s->raw_packet_buffer, pkt, &s->raw_packet_buffer_end); if(st->codec->codec_id == CODEC_ID_PROBE){ AVProbeData *pd = &st->probe_data; @@ -1043,7 +1044,8 @@ int av_read_frame(AVFormatContext *s, AVPacket *pkt) return ret; } - if(av_dup_packet(add_to_pktbuf(&s->packet_buffer, pkt)) < 0) + if(av_dup_packet(add_to_pktbuf(&s->packet_buffer, pkt, + &s->packet_buffer_end)) < 0) return AVERROR(ENOMEM); }else{ assert(!s->packet_buffer); @@ -2021,7 +2023,7 @@ int av_find_stream_info(AVFormatContext *ic) break; } - pkt= add_to_pktbuf(&ic->packet_buffer, &pkt1); + pkt= add_to_pktbuf(&ic->packet_buffer, &pkt1, &ic->packet_buffer_end); if(av_dup_packet(pkt) < 0) { av_free(duration_error); return AVERROR(ENOMEM); |