forked from FFmpeg/FFmpeg
Move add_to_pktbuf() before av_read_packet(). My future work on codec identification
cleanup will need this. Originally committed as revision 14181 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
64cd3108df
commit
9d3b9f2cce
1 changed files with 16 additions and 16 deletions
|
@ -520,6 +520,22 @@ 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));
|
||||||
|
if (!pktl)
|
||||||
|
return NULL;
|
||||||
|
|
||||||
|
/* add the packet in the buffered packet list */
|
||||||
|
*plast_pktl = pktl;
|
||||||
|
pktl->pkt= *pkt;
|
||||||
|
return &pktl->pkt;
|
||||||
|
}
|
||||||
|
|
||||||
int av_read_packet(AVFormatContext *s, AVPacket *pkt)
|
int av_read_packet(AVFormatContext *s, AVPacket *pkt)
|
||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
|
@ -945,22 +961,6 @@ static int av_read_frame_internal(AVFormatContext *s, AVPacket *pkt)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
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));
|
|
||||||
if (!pktl)
|
|
||||||
return NULL;
|
|
||||||
|
|
||||||
/* add the packet in the buffered packet list */
|
|
||||||
*plast_pktl = pktl;
|
|
||||||
pktl->pkt= *pkt;
|
|
||||||
return &pktl->pkt;
|
|
||||||
}
|
|
||||||
|
|
||||||
int av_read_frame(AVFormatContext *s, AVPacket *pkt)
|
int av_read_frame(AVFormatContext *s, AVPacket *pkt)
|
||||||
{
|
{
|
||||||
AVPacketList *pktl;
|
AVPacketList *pktl;
|
||||||
|
|
Loading…
Add table
Reference in a new issue