summaryrefslogtreecommitdiff
path: root/libavformat/libmodplug.c
diff options
context:
space:
mode:
Diffstat (limited to 'libavformat/libmodplug.c')
-rw-r--r--libavformat/libmodplug.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/libavformat/libmodplug.c b/libavformat/libmodplug.c
index d4f78d99b1..6a32618e6f 100644
--- a/libavformat/libmodplug.c
+++ b/libavformat/libmodplug.c
@@ -270,6 +270,7 @@ static void write_text(uint8_t *dst, const char *s, int linesize, int x, int y)
static int modplug_read_packet(AVFormatContext *s, AVPacket *pkt)
{
ModPlugContext *modplug = s->priv_data;
+ int ret;
if (modplug->video_stream) {
modplug->video_switch ^= 1; // one video packet for one audio packet
@@ -285,8 +286,8 @@ static int modplug_read_packet(AVFormatContext *s, AVPacket *pkt)
var_values[VAR_PATTERN] = ModPlug_GetCurrentPattern(modplug->f);
var_values[VAR_ROW ] = ModPlug_GetCurrentRow (modplug->f);
- if (av_new_packet(pkt, modplug->fsize) < 0)
- return AVERROR(ENOMEM);
+ if ((ret = av_new_packet(pkt, modplug->fsize)) < 0)
+ return ret;
pkt->stream_index = 1;
memset(pkt->data, 0, modplug->fsize);
@@ -318,8 +319,8 @@ static int modplug_read_packet(AVFormatContext *s, AVPacket *pkt)
}
}
- if (av_new_packet(pkt, AUDIO_PKT_SIZE) < 0)
- return AVERROR(ENOMEM);
+ if ((ret = av_new_packet(pkt, AUDIO_PKT_SIZE)) < 0)
+ return ret;
if (modplug->video_stream)
pkt->pts = pkt->dts = modplug->packet_count++ * modplug->ts_per_packet;