Mercurial > libavformat.hg
changeset 775:c5077fdab490 libavformat
AVPacket.pos
| author | michael |
|---|---|
| date | Thu, 26 May 2005 20:17:12 +0000 |
| parents | 820863425158 |
| children | 47c7fa7c2e7c |
| files | 4xm.c amr.c asf.c au.c avformat.h avidec.c electronicarts.c ffm.c flic.c flvdec.c idcin.c idroq.c ipmovie.c matroska.c mov.c mp3.c mpegts.c nsvdec.c nut.c psxstr.c raw.c rm.c segafilm.c sierravmd.c sol.c swf.c utils.c wc3movie.c westwood.c yuv4mpeg.c |
| diffstat | 30 files changed, 88 insertions(+), 132 deletions(-) [+] |
line wrap: on
line diff
--- a/4xm.c Thu May 26 07:47:51 2005 +0000 +++ b/4xm.c Thu May 26 20:17:12 2005 +0000 @@ -277,6 +277,7 @@ return AVERROR_IO; pkt->stream_index = fourxm->video_stream_index; pkt->pts = fourxm->video_pts; + pkt->pos = url_ftell(&s->pb); memcpy(pkt->data, header, 8); ret = get_buffer(&s->pb, &pkt->data[8], size); @@ -293,16 +294,13 @@ size-=8; if (track_number == fourxm->selected_track) { - if (av_new_packet(pkt, size)) + ret= av_get_packet(&s->pb, pkt, size); + if(ret<0) return AVERROR_IO; pkt->stream_index = fourxm->tracks[fourxm->selected_track].stream_index; pkt->pts = fourxm->audio_pts; - ret = get_buffer(&s->pb, pkt->data, size); - if (ret < 0) - av_free_packet(pkt); - else - packet_read = 1; + packet_read = 1; /* pts accounting */ audio_frame_count = size;
--- a/amr.c Thu May 26 07:47:51 2005 +0000 +++ b/amr.c Thu May 26 20:17:12 2005 +0000 @@ -154,7 +154,7 @@ return AVERROR_IO; } pkt->stream_index = 0; - + pkt->pos= url_ftell(&s->pb); pkt->data[0]=toc; read = get_buffer(&s->pb, pkt->data+1, size); @@ -189,6 +189,7 @@ } pkt->stream_index = 0; + pkt->pos= url_ftell(&s->pb); pkt->data[0]=toc; read = get_buffer(&s->pb, pkt->data+1, size-1);
--- a/asf.c Thu May 26 07:47:51 2005 +0000 +++ b/asf.c Thu May 26 20:17:12 2005 +0000 @@ -604,6 +604,7 @@ asf_st->seq = asf->packet_seq; asf_st->pkt.pts = asf->packet_frag_timestamp; asf_st->pkt.stream_index = asf->stream_index; + asf_st->pkt.pos = asf_st->packet_pos= asf->packet_pos; //printf("new packet: stream:%d key:%d packet_key:%d audio:%d size:%d\n", //asf->stream_index, asf->packet_key_frame, asf_st->pkt.flags & PKT_FLAG_KEY,
--- a/au.c Thu May 26 07:47:51 2005 +0000 +++ b/au.c Thu May 26 20:17:12 2005 +0000 @@ -161,13 +161,11 @@ if (url_feof(&s->pb)) return AVERROR_IO; - if (av_new_packet(pkt, MAX_SIZE)) + ret= av_get_packet(&s->pb, pkt, MAX_SIZE); + if (ret < 0) return AVERROR_IO; pkt->stream_index = 0; - ret = get_buffer(&s->pb, pkt->data, pkt->size); - if (ret < 0) - av_free_packet(pkt); /* note: we need to modify the packet size here to handle the last packet */ pkt->size = ret;
--- a/avformat.h Thu May 26 07:47:51 2005 +0000 +++ b/avformat.h Thu May 26 20:17:12 2005 +0000 @@ -5,7 +5,7 @@ extern "C" { #endif -#define LIBAVFORMAT_BUILD 4624 +#define LIBAVFORMAT_BUILD 4625 #define LIBAVFORMAT_VERSION_INT FFMPEG_VERSION_INT #define LIBAVFORMAT_VERSION FFMPEG_VERSION @@ -28,17 +28,16 @@ #endif typedef struct AVPacket { - int64_t pts; /* presentation time stamp in AV_TIME_BASE units (or - pts_den units in muxers or demuxers) */ - int64_t dts; /* decompression time stamp in AV_TIME_BASE units (or - pts_den units in muxers or demuxers) */ + int64_t pts; ///< presentation time stamp in time_base units + int64_t dts; ///< decompression time stamp in time_base units uint8_t *data; int size; int stream_index; int flags; - int duration; /* presentation duration (0 if not available) */ + int duration; ///< presentation duration in time_base units (0 if not available) void (*destruct)(struct AVPacket *); void *priv; + int64_t pos; ///< byte position in stream, -1 if unknown } AVPacket; #define PKT_FLAG_KEY 0x0001 @@ -49,6 +48,7 @@ { pkt->pts = AV_NOPTS_VALUE; pkt->dts = AV_NOPTS_VALUE; + pkt->pos = -1; pkt->duration = 0; pkt->flags = 0; pkt->stream_index = 0; @@ -56,6 +56,7 @@ } int av_new_packet(AVPacket *pkt, int size); +int av_get_packet(ByteIOContext *s, AVPacket *pkt, int size); int av_dup_packet(AVPacket *pkt); /**
--- a/avidec.c Thu May 26 07:47:51 2005 +0000 +++ b/avidec.c Thu May 26 20:17:12 2005 +0000 @@ -423,8 +423,7 @@ if(size > ast->remaining) size= ast->remaining; - av_new_packet(pkt, size); - get_buffer(pb, pkt->data, size); + av_get_packet(pb, pkt, size); if (avi->dv_demux) { dstr = pkt->destruct;
--- a/electronicarts.c Thu May 26 07:47:51 2005 +0000 +++ b/electronicarts.c Thu May 26 20:17:12 2005 +0000 @@ -234,13 +234,10 @@ switch (chunk_type) { /* audio data */ case SCDl_TAG: - if (av_new_packet(pkt, chunk_size)) + ret = av_get_packet(pb, pkt, chunk_size); + if (ret != chunk_size) ret = AVERROR_IO; else { - ret = get_buffer(pb, pkt->data, chunk_size); - if (ret != chunk_size) - ret = AVERROR_IO; - else { pkt->stream_index = ea->audio_stream_index; pkt->pts = 90000; pkt->pts *= ea->audio_frame_counter; @@ -250,7 +247,6 @@ * on stereo; chunk also has 12-byte header */ ea->audio_frame_counter += ((chunk_size - 12) * 2) / ea->num_channels; - } } packet_read = 1;
--- a/ffm.c Thu May 26 07:47:51 2005 +0000 +++ b/ffm.c Thu May 26 20:17:12 2005 +0000 @@ -603,6 +603,7 @@ av_new_packet(pkt, size); pkt->stream_index = ffm->header[0]; + pkt->pos = url_ftell(&s->pb); if (ffm->header[1] & FLAG_KEY_FRAME) pkt->flags |= PKT_FLAG_KEY;
--- a/flic.c Thu May 26 07:47:51 2005 +0000 +++ b/flic.c Thu May 26 20:17:12 2005 +0000 @@ -178,6 +178,7 @@ } pkt->stream_index = flic->video_stream_index; pkt->pts = flic->pts; + pkt->pos = url_ftell(pb); memcpy(pkt->data, preamble, FLIC_PREAMBLE_SIZE); ret = get_buffer(pb, pkt->data + FLIC_PREAMBLE_SIZE, size - FLIC_PREAMBLE_SIZE);
--- a/flvdec.c Thu May 26 07:47:51 2005 +0000 +++ b/flvdec.c Thu May 26 20:17:12 2005 +0000 @@ -147,12 +147,8 @@ } } - if (av_new_packet(pkt, size) < 0) - return AVERROR_IO; - - ret = get_buffer(&s->pb, pkt->data, size); + ret= av_get_packet(&s->pb, pkt, size); if (ret <= 0) { - av_free_packet(pkt); return AVERROR_IO; } /* note: we need to modify the packet size here to handle the last
--- a/idcin.c Thu May 26 07:47:51 2005 +0000 +++ b/idcin.c Thu May 26 20:17:12 2005 +0000 @@ -255,26 +255,22 @@ /* skip the number of decoded bytes (always equal to width * height) */ url_fseek(pb, 4, SEEK_CUR); chunk_size -= 4; - if (av_new_packet(pkt, chunk_size)) - ret = AVERROR_IO; + ret= av_get_packet(pb, pkt, chunk_size); + if (ret != chunk_size) + return AVERROR_IO; pkt->stream_index = idcin->video_stream_index; pkt->pts = idcin->pts; - ret = get_buffer(pb, pkt->data, chunk_size); - if (ret != chunk_size) - ret = AVERROR_IO; } else { /* send out the audio chunk */ if (idcin->current_audio_chunk) chunk_size = idcin->audio_chunk_size2; else chunk_size = idcin->audio_chunk_size1; - if (av_new_packet(pkt, chunk_size)) + ret= av_get_packet(pb, pkt, chunk_size); + if (ret != chunk_size) return AVERROR_IO; pkt->stream_index = idcin->audio_stream_index; pkt->pts = idcin->pts; - ret = get_buffer(&s->pb, pkt->data, chunk_size); - if (ret != chunk_size) - ret = AVERROR_IO; idcin->current_audio_chunk ^= 1; idcin->pts += FRAME_PTS_INC;
--- a/idroq.c Thu May 26 07:47:51 2005 +0000 +++ b/idroq.c Thu May 26 20:17:12 2005 +0000 @@ -221,13 +221,11 @@ url_fseek(pb, codebook_offset, SEEK_SET); /* load up the packet */ - if (av_new_packet(pkt, chunk_size)) + ret= av_get_packet(pb, pkt, chunk_size); + if (ret != chunk_size) return AVERROR_IO; pkt->stream_index = roq->video_stream_index; pkt->pts = roq->video_pts; - ret = get_buffer(pb, pkt->data, chunk_size); - if (ret != chunk_size) - ret = AVERROR_IO; roq->video_pts += roq->frame_pts_inc; packet_read = 1; @@ -254,6 +252,7 @@ roq->audio_frame_count += (chunk_size / roq->audio_channels); } + pkt->pos= url_ftell(pb); ret = get_buffer(pb, pkt->data + RoQ_CHUNK_PREAMBLE_SIZE, chunk_size); if (ret != chunk_size)
--- a/ipmovie.c Thu May 26 07:47:51 2005 +0000 +++ b/ipmovie.c Thu May 26 20:17:12 2005 +0000 @@ -140,16 +140,11 @@ audio_pts *= s->audio_frame_count; audio_pts /= s->audio_sample_rate; - if (av_new_packet(pkt, s->audio_chunk_size)) - return CHUNK_NOMEM; + if (s->audio_chunk_size != av_get_packet(pb, pkt, s->audio_chunk_size)) + return CHUNK_EOF; pkt->stream_index = s->audio_stream_index; pkt->pts = audio_pts; - if (get_buffer(pb, pkt->data, s->audio_chunk_size) != - s->audio_chunk_size) { - av_free_packet(pkt); - return CHUNK_EOF; - } /* audio frame maintenance */ if (s->audio_type != CODEC_ID_INTERPLAY_DPCM) @@ -171,6 +166,7 @@ if (av_new_packet(pkt, s->decode_map_chunk_size + s->video_chunk_size)) return CHUNK_NOMEM; + pkt->pos= s->decode_map_chunk_offset; url_fseek(pb, s->decode_map_chunk_offset, SEEK_SET); s->decode_map_chunk_offset = 0;
--- a/matroska.c Thu May 26 07:47:51 2005 +0000 +++ b/matroska.c Thu May 26 20:17:12 2005 +0000 @@ -2366,6 +2366,7 @@ uint32_t *lace_size = NULL; int n, track, flags, laces = 0; uint64_t num; + int64_t pos= url_ftell(&matroska->ctx->pb); if ((res = ebml_read_binary(matroska, &id, &data, &size)) < 0) break; @@ -2507,6 +2508,7 @@ matroska->tracks[track]->stream_index; pkt->pts = timecode / 1000000; /* ns to ms */ + pkt->pos= pos; matroska_queue_packet(matroska, pkt); }
--- a/mov.c Thu May 26 07:47:51 2005 +0000 +++ b/mov.c Thu May 26 20:17:12 2005 +0000 @@ -253,9 +253,6 @@ int time_scale; long current_sample; long left_in_chunk; /* how many samples before next chunk */ - /* specific MPEG4 header which is added at the beginning of the stream */ - unsigned int header_len; - uint8_t *header_data; MOV_esds_t esds; } MOVStreamContext; @@ -1672,7 +1669,6 @@ av_freep(&sc->sample_to_chunk); av_freep(&sc->sample_sizes); av_freep(&sc->keyframes); - av_freep(&sc->header_data); av_freep(&sc->stts_data); av_freep(&sc->ctts_data); av_freep(&sc); @@ -1974,18 +1970,7 @@ return -1; url_fseek(&s->pb, offset, SEEK_SET); - //av_log(NULL, AV_LOG_DEBUG, "READCHUNK hlen: %d %d off: %Ld pos:%Ld\n", size, sc->header_len, offset, url_ftell(&s->pb)); - if (sc->header_len > 0) { - av_new_packet(pkt, size + sc->header_len); - memcpy(pkt->data, sc->header_data, sc->header_len); - get_buffer(&s->pb, pkt->data + sc->header_len, size); - /* free header */ - av_freep(&sc->header_data); - sc->header_len = 0; - } else { - av_new_packet(pkt, size); - get_buffer(&s->pb, pkt->data, pkt->size); - } + av_get_packet(&s->pb, pkt, size); pkt->stream_index = sc->ffindex; // If the keyframes table exists, mark any samples that are in the table as key frames.
--- a/mp3.c Thu May 26 07:47:51 2005 +0000 +++ b/mp3.c Thu May 26 20:17:12 2005 +0000 @@ -297,13 +297,10 @@ size= MP3_PACKET_SIZE; - if (av_new_packet(pkt, size) < 0) - return AVERROR_IO; + ret= av_get_packet(&s->pb, pkt, size); pkt->stream_index = 0; - ret = get_buffer(&s->pb, pkt->data, size); if (ret <= 0) { - av_free_packet(pkt); return AVERROR_IO; } /* note: we need to modify the packet size here to handle the last
--- a/mpegts.c Thu May 26 07:47:51 2005 +0000 +++ b/mpegts.c Thu May 26 20:17:12 2005 +0000 @@ -1234,6 +1234,7 @@ if (av_new_packet(pkt, TS_PACKET_SIZE) < 0) return -ENOMEM; + pkt->pos= url_ftell(&s->pb); ret = read_packet(&s->pb, pkt->data, ts->raw_packet_size); if (ret < 0) { av_free_packet(pkt);
--- a/nsvdec.c Thu May 26 07:47:51 2005 +0000 +++ b/nsvdec.c Thu May 26 20:17:12 2005 +0000 @@ -592,8 +592,7 @@ if (vsize/* && st[NSV_ST_VIDEO]*/) { nst = st[NSV_ST_VIDEO]->priv_data; pkt = &nsv->ahead[NSV_ST_VIDEO]; - av_new_packet(pkt, vsize); - get_buffer(pb, pkt->data, vsize); + av_get_packet(pb, pkt, vsize); pkt->stream_index = st[NSV_ST_VIDEO]->index;//NSV_ST_VIDEO; pkt->dts = nst->frame_offset++; pkt->flags |= PKT_FLAG_KEY; /* stupid format has no way to tell XXX: try the index */ @@ -633,9 +632,7 @@ PRINT(("NSV RAWAUDIO: bps %d, nchan %d, srate %ld\n", bps, channels, samplerate)); } } - av_new_packet(pkt, asize); - if (asize) - get_buffer(pb, pkt->data, asize); + av_get_packet(pb, pkt, asize); pkt->stream_index = st[NSV_ST_AUDIO]->index;//NSV_ST_AUDIO; //pkt->dts = nst->frame_offset; //if (nst->sample_size)
--- a/nut.c Thu May 26 07:47:51 2005 +0000 +++ b/nut.c Thu May 26 20:17:12 2005 +0000 @@ -1236,8 +1236,7 @@ return 1; } - av_new_packet(pkt, size); - get_buffer(bc, pkt->data, size); + av_get_packet(bc, pkt, size); pkt->stream_index = stream_id; if (key_frame) pkt->flags |= PKT_FLAG_KEY;
--- a/psxstr.c Thu May 26 07:47:51 2005 +0000 +++ b/psxstr.c Thu May 26 20:17:12 2005 +0000 @@ -283,6 +283,7 @@ if (av_new_packet(pkt, frame_size)) return AVERROR_IO; + pkt->pos= url_ftell(pb) - RAW_CD_SECTOR_SIZE; pkt->stream_index = str->channels[channel].video_stream_index; // pkt->pts = str->pts;
--- a/raw.c Thu May 26 07:47:51 2005 +0000 +++ b/raw.c Thu May 26 20:17:12 2005 +0000 @@ -88,13 +88,10 @@ size= RAW_PACKET_SIZE; - if (av_new_packet(pkt, size) < 0) - return AVERROR_IO; + ret= av_get_packet(&s->pb, pkt, size); pkt->stream_index = 0; - ret = get_buffer(&s->pb, pkt->data, size); if (ret <= 0) { - av_free_packet(pkt); return AVERROR_IO; } /* note: we need to modify the packet size here to handle the last @@ -111,7 +108,8 @@ if (av_new_packet(pkt, size) < 0) return AVERROR_IO; - + + pkt->pos= url_ftell(&s->pb); pkt->stream_index = 0; ret = get_partial_buffer(&s->pb, pkt->data, size); if (ret <= 0) { @@ -618,18 +616,10 @@ if (packet_size < 0) return -1; - if (av_new_packet(pkt, packet_size) < 0) - return AVERROR_IO; + ret= av_get_packet(&s->pb, pkt, packet_size); pkt->stream_index = 0; -#if 0 - /* bypass buffered I/O */ - ret = url_read(url_fileno(&s->pb), pkt->data, pkt->size); -#else - ret = get_buffer(&s->pb, pkt->data, pkt->size); -#endif - if (ret != pkt->size) { - av_free_packet(pkt); + if (ret != packet_size) { return AVERROR_IO; } else { return 0;
--- a/rm.c Thu May 26 07:47:51 2005 +0000 +++ b/rm.c Thu May 26 20:17:12 2005 +0000 @@ -812,11 +812,9 @@ if (rm->old_format) { /* just read raw bytes */ len = RAW_PACKET_SIZE; - av_new_packet(pkt, len); + len= av_get_packet(pb, pkt, len); pkt->stream_index = 0; - len = get_buffer(pb, pkt->data, len); if (len <= 0) { - av_free_packet(pkt); return AVERROR_IO; } pkt->size = len; @@ -860,9 +858,8 @@ goto resync; } - av_new_packet(pkt, len); + av_get_packet(pb, pkt, len); pkt->stream_index = i; - get_buffer(pb, pkt->data, len); #if 0 if (st->codec.codec_type == CODEC_TYPE_VIDEO) {
--- a/segafilm.c Thu May 26 07:47:51 2005 +0000 +++ b/segafilm.c Thu May 26 20:17:12 2005 +0000 @@ -233,6 +233,7 @@ return AVERROR_NOMEM; if(pkt->size < 10) return -1; + pkt->pos= url_ftell(pb); ret = get_buffer(pb, pkt->data, 10); /* skip the non-spec CVID bytes */ url_fseek(pb, film->cvid_extra_bytes, SEEK_CUR); @@ -254,6 +255,7 @@ film->stereo_buffer = av_malloc(film->stereo_buffer_size); } + pkt->pos= url_ftell(pb); ret = get_buffer(pb, film->stereo_buffer, sample->sample_size); if (ret != sample->sample_size) ret = AVERROR_IO; @@ -272,9 +274,7 @@ } } } else { - if (av_new_packet(pkt, sample->sample_size)) - return AVERROR_NOMEM; - ret = get_buffer(pb, pkt->data, sample->sample_size); + ret= av_get_packet(pb, pkt, sample->sample_size); if (ret != sample->sample_size) ret = AVERROR_IO; }
--- a/sierravmd.c Thu May 26 07:47:51 2005 +0000 +++ b/sierravmd.c Thu May 26 20:17:12 2005 +0000 @@ -269,6 +269,7 @@ if (av_new_packet(pkt, frame->frame_size + BYTES_PER_FRAME_RECORD)) return AVERROR_NOMEM; + pkt->pos= url_ftell(pb); memcpy(pkt->data, frame->frame_record, BYTES_PER_FRAME_RECORD); ret = get_buffer(pb, pkt->data + BYTES_PER_FRAME_RECORD, frame->frame_size);
--- a/sol.c Thu May 26 07:47:51 2005 +0000 +++ b/sol.c Thu May 26 20:17:12 2005 +0000 @@ -131,13 +131,9 @@ if (url_feof(&s->pb)) return -EIO; - if (av_new_packet(pkt, MAX_SIZE)) - return -EIO; + ret= av_get_packet(&s->pb, pkt, MAX_SIZE); pkt->stream_index = 0; - ret = get_buffer(&s->pb, pkt->data, pkt->size); - if (ret < 0) - av_free_packet(pkt); /* note: we need to modify the packet size here to handle the last packet */ pkt->size = ret;
--- a/swf.c Thu May 26 07:47:51 2005 +0000 +++ b/swf.c Thu May 26 20:17:12 2005 +0000 @@ -858,10 +858,9 @@ if (st->id == 0) { if ( get_le16(pb) == swf->ch_id ) { frame = get_le16(pb); - av_new_packet(pkt, len-4); + av_get_packet(pb, pkt, len-4); pkt->pts = frame * swf->ms_per_frame; pkt->stream_index = st->index; - get_buffer(pb, pkt->data, pkt->size); return pkt->size; } else { url_fskip(pb, len-2); @@ -874,9 +873,8 @@ for( i=0; i<s->nb_streams; i++ ) { st = s->streams[i]; if (st->id == 1) { - av_new_packet(pkt, len); + av_get_packet(pb, pkt, len); pkt->stream_index = st->index; - get_buffer(pb, pkt->data, pkt->size); return pkt->size; } }
--- a/utils.c Thu May 26 07:47:51 2005 +0000 +++ b/utils.c Thu May 26 20:17:12 2005 +0000 @@ -195,6 +195,31 @@ return 0; } +/** + * Allocate and read the payload of a packet and intialized its fields to default values. + * + * @param pkt packet + * @param size wanted payload size + * @return >0 (read size) if OK. AVERROR_xxx otherwise. + */ +int av_get_packet(ByteIOContext *s, AVPacket *pkt, int size) +{ + int ret= av_new_packet(pkt, size); + + if(ret<0) + return ret; + + pkt->pos= url_ftell(s); + + ret= get_buffer(s, pkt->data, size); + if(ret<=0) + av_free_packet(pkt); + else + pkt->size= ret; + + return ret; +} + /* This is a hack - the packet memory allocation stuff is broken. The packet is allocated if it was not really allocated */ int av_dup_packet(AVPacket *pkt)
--- a/wc3movie.c Thu May 26 07:47:51 2005 +0000 +++ b/wc3movie.c Thu May 26 20:17:12 2005 +0000 @@ -318,11 +318,9 @@ case VGA__TAG: /* send out video chunk */ - if (av_new_packet(pkt, size)) - ret = AVERROR_IO; + ret= av_get_packet(pb, pkt, size); pkt->stream_index = wc3->video_stream_index; pkt->pts = wc3->pts; - ret = get_buffer(pb, pkt->data, size); if (ret != size) ret = AVERROR_IO; packet_read = 1; @@ -349,11 +347,9 @@ case AUDI_TAG: /* send out audio chunk */ - if (av_new_packet(pkt, size)) - ret = AVERROR_IO; + ret= av_get_packet(pb, pkt, size); pkt->stream_index = wc3->audio_stream_index; pkt->pts = wc3->pts; - ret = get_buffer(pb, pkt->data, size); if (ret != size) ret = AVERROR_IO;
--- a/westwood.c Thu May 26 07:47:51 2005 +0000 +++ b/westwood.c Thu May 26 20:17:12 2005 +0000 @@ -170,15 +170,12 @@ return AVERROR_INVALIDDATA; chunk_size = LE_16(&preamble[0]); - if (av_new_packet(pkt, chunk_size)) + ret= av_get_packet(pb, pkt, chunk_size); + if (ret != chunk_size) return AVERROR_IO; pkt->stream_index = wsaud->audio_stream_index; pkt->pts = wsaud->audio_frame_counter; pkt->pts /= wsaud->audio_samplerate; - if ((ret = get_buffer(pb, pkt->data, chunk_size)) != chunk_size) { - av_free_packet(pkt); - ret = AVERROR_IO; - } /* 2 samples/byte, 1 or 2 samples per frame depending on stereo */ wsaud->audio_frame_counter += (chunk_size * 2) / wsaud->audio_channels; @@ -322,11 +319,8 @@ if ((chunk_type == SND2_TAG) || (chunk_type == VQFR_TAG)) { - if (av_new_packet(pkt, chunk_size)) - return AVERROR_IO; - ret = get_buffer(pb, pkt->data, chunk_size); + av_get_packet(pb, pkt, chunk_size); if (ret != chunk_size) { - av_free_packet(pkt); ret = AVERROR_IO; }
--- a/yuv4mpeg.c Thu May 26 07:47:51 2005 +0000 +++ b/yuv4mpeg.c Thu May 26 20:17:12 2005 +0000 @@ -356,17 +356,11 @@ if (packet_size < 0) return -1; - if (av_new_packet(pkt, packet_size) < 0) + if (av_get_packet(&s->pb, pkt, packet_size) != packet_size) return AVERROR_IO; pkt->stream_index = 0; - ret = get_buffer(&s->pb, pkt->data, pkt->size); - if (ret != pkt->size) { - av_free_packet(pkt); - return AVERROR_IO; - } else { - return 0; - } + return 0; } static int yuv4_read_close(AVFormatContext *s)