DV packet copy fix by Roman Shaposhnick

Originally committed as revision 1548 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Fabrice Bellard 2003-02-06 22:34:55 +00:00
parent cc0799e5f8
commit ec82011340

View File

@ -53,7 +53,12 @@ static int dv_read_header(AVFormatContext *s,
return 0; return 0;
} }
/* XXX: build fake audio stream when DV audio decoder will be finished */ static void __destruct_pkt(struct AVPacket *pkt)
{
pkt->data = NULL; pkt->size = 0;
return;
}
static int dv_read_packet(AVFormatContext *s, AVPacket *pkt) static int dv_read_packet(AVFormatContext *s, AVPacket *pkt)
{ {
int ret, dsf; int ret, dsf;
@ -74,13 +79,14 @@ static int dv_read_packet(AVFormatContext *s, AVPacket *pkt)
return -EIO; return -EIO;
} }
if (av_new_packet(pkt, c->size) < 0) av_init_packet(pkt);
return -EIO; pkt->destruct = __destruct_pkt;
pkt->data = c->buf;
pkt->size = c->size;
pkt->stream_index = c->is_audio; pkt->stream_index = c->is_audio;
c->is_audio = !c->is_audio; c->is_audio = !c->is_audio;
memcpy(pkt->data, c->buf, c->size); return c->size;
return ret;
} }
static int dv_read_close(AVFormatContext *s) static int dv_read_close(AVFormatContext *s)