highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libmodplug: simplify and fix read_packet() callback.

Browse Source 
In case of av_new_packet() error, a correct return error code is raised,
the data memcpy is avoided, and pkt dts/pts are not assigned anymore
(since the defaults are good).
This commit is contained in:
Clément Bœsch
2011-10-05 21:20:28 +02:00
parent 5420885737
commit 9a2ceee2e3
1 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
libavformat/libmodplug.c
View File

@ -66,20 +66,16 @@ static int modplug_read_header(AVFormatContext *s, AVFormatParameters *ap)
static int modplug_read_packet(AVFormatContext *s, AVPacket *pkt) static int modplug_read_packet(AVFormatContext *s, AVPacket *pkt)
{ {
int ret, n;
ModPlugContext *modplug = s->priv_data; ModPlugContext *modplug = s->priv_data;
uint8_t buf[512];
n = ModPlug_Read(modplug->f, buf, sizeof(buf)); if (av_new_packet(pkt, 512) < 0)
if (n <= 0) return AVERROR(ENOMEM);
pkt->size = ModPlug_Read(modplug->f, pkt->data, 512);
if (pkt->size <= 0) {
av_free_packet(pkt);
return AVERROR(EIO); return AVERROR(EIO);
}
ret = av_new_packet(pkt, n);
if (ret)
return ret;
pkt->pts = pkt->dts = AV_NOPTS_VALUE;
pkt->size = n;
memcpy(pkt->data, buf, n);
return 0; return 0;
} }