har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove some useless code that duplicates av_get_packet.

Browse Source 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
This commit is contained in:
Reimar Döffinger 2012-05-01 19:59:29 +02:00
parent 7effbee66c
commit 8f63f241d4
8 changed files with 6 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/au.c
View File

@ -189,10 +189,6 @@ static int au_read_packet(AVFormatContext *s,
return ret; return ret;
pkt->flags &= ~AV_PKT_FLAG_CORRUPT; pkt->flags &= ~AV_PKT_FLAG_CORRUPT;
pkt->stream_index = 0; pkt->stream_index = 0;
/* note: we need to modify the packet size here to handle the last
packet */
pkt->size = ret;
return 0; return 0;
} }

3
libavformat/flvdec.c
View File

@ -656,9 +656,6 @@ static int flv_read_packet(AVFormatContext *s, AVPacket *pkt)
if (ret < 0) { if (ret < 0) {
return AVERROR(EIO); return AVERROR(EIO);
} }
/* note: we need to modify the packet size here to handle the last
packet */
pkt->size = ret;
pkt->dts = dts; pkt->dts = dts;
pkt->pts = pts == AV_NOPTS_VALUE ? dts : pts; pkt->pts = pts == AV_NOPTS_VALUE ? dts : pts;
pkt->stream_index = st->index; pkt->stream_index = st->index;

1
libavformat/gsmdec.c
View File

@ -47,7 +47,6 @@ static int gsm_read_packet(AVFormatContext *s, AVPacket *pkt)
av_free_packet(pkt); av_free_packet(pkt);
return ret < 0 ? ret : AVERROR(EIO); return ret < 0 ? ret : AVERROR(EIO);
} }
pkt->size = ret;
pkt->duration = 1; pkt->duration = 1;
pkt->pts = pkt->pos / GSM_BLOCK_SIZE; pkt->pts = pkt->pos / GSM_BLOCK_SIZE;

13
libavformat/ingenientdec.c
View File

@ -44,17 +44,10 @@ static int ingenient_read_packet(AVFormatContext *s, AVPacket *pkt)
av_log(s, AV_LOG_DEBUG, "Ingenient packet: size=%d, width=%d, height=%d, unk1=%d unk2=%d\n", av_log(s, AV_LOG_DEBUG, "Ingenient packet: size=%d, width=%d, height=%d, unk1=%d unk2=%d\n",
size, w, h, unk1, unk2); size, w, h, unk1, unk2);
if (av_new_packet(pkt, size) < 0) ret = av_get_packet(s->pb, pkt, size);
return AVERROR(ENOMEM); if (ret < 0)
pkt->pos = avio_tell(s->pb);
pkt->stream_index = 0;
ret = avio_read(s->pb, pkt->data, size);
if (ret < 0) {
av_free_packet(pkt);
return ret; return ret;
} pkt->stream_index = 0;
pkt->size = ret;
return ret; return ret;
} }

10
libavformat/mmf.c
View File

@ -275,17 +275,13 @@ static int mmf_read_packet(AVFormatContext *s,
if(!size) if(!size)
return AVERROR(EIO); return AVERROR(EIO);
if (av_new_packet(pkt, size)) ret = av_get_packet(s->pb, pkt, size);
return AVERROR(EIO);
pkt->stream_index = 0;
ret = avio_read(s->pb, pkt->data, pkt->size);
if (ret < 0) if (ret < 0)
av_free_packet(pkt); return ret;
pkt->stream_index = 0;
mmf->data_size -= ret; mmf->data_size -= ret;
pkt->size = ret;
return ret; return ret;
} }

3
libavformat/rsodec.c
View File

@ -83,9 +83,6 @@ static int rso_read_packet(AVFormatContext *s, AVPacket *pkt)
pkt->flags &= ~AV_PKT_FLAG_CORRUPT; pkt->flags &= ~AV_PKT_FLAG_CORRUPT;
pkt->stream_index = 0; pkt->stream_index = 0;
/* note: we need to modify the packet size here to handle the last packet */
pkt->size = ret;
return 0; return 0;
} }

4
libavformat/sol.c
View File

@ -135,10 +135,6 @@ static int sol_read_packet(AVFormatContext *s,
return ret; return ret;
pkt->flags &= ~AV_PKT_FLAG_CORRUPT; pkt->flags &= ~AV_PKT_FLAG_CORRUPT;
pkt->stream_index = 0; pkt->stream_index = 0;
/* note: we need to modify the packet size here to handle the last
packet */
pkt->size = ret;
return 0; return 0;
} }

1
libavformat/soxdec.c
View File

@ -140,7 +140,6 @@ static int sox_read_packet(AVFormatContext *s,
return AVERROR(EIO); return AVERROR(EIO);
pkt->flags &= ~AV_PKT_FLAG_CORRUPT; pkt->flags &= ~AV_PKT_FLAG_CORRUPT;
pkt->stream_index = 0; pkt->stream_index = 0;
pkt->size = ret;
return 0; return 0;
} }