aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClément Bœsch <ubitux@gmail.com>2012-10-11 23:59:54 +0200
committerClément Bœsch <ubitux@gmail.com>2012-10-12 23:15:05 +0200
commitcd78192d09d19e1bb3d85988e115f096378cad97 (patch)
tree7127e58ee6d00e8598e365ade1c427eab6e14e03
parent5e885275f1eda3f0281747d9c78d072adb8bc940 (diff)
downloadffmpeg-cd78192d09d19e1bb3d85988e115f096378cad97.tar.gz
lavf/swfdec: return more meaningful error codes.
-rw-r--r--libavformat/swfdec.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libavformat/swfdec.c b/libavformat/swfdec.c
index 8ef24a5ae5..e8ab718577 100644
--- a/libavformat/swfdec.c
+++ b/libavformat/swfdec.c
@@ -169,7 +169,7 @@ static int swf_read_packet(AVFormatContext *s, AVPacket *pkt)
/* Check for FLV1 */
vst = avformat_new_stream(s, NULL);
if (!vst)
- return -1;
+ return AVERROR(ENOMEM);
vst->id = ch_id;
vst->codec->codec_type = AVMEDIA_TYPE_VIDEO;
vst->codec->codec_id = ff_codec_get_id(ff_swf_codec_tags, avio_r8(pb));
@@ -190,7 +190,7 @@ static int swf_read_packet(AVFormatContext *s, AVPacket *pkt)
swf->samples_per_frame = avio_rl16(pb);
ast = avformat_new_stream(s, NULL);
if (!ast)
- return -1;
+ return AVERROR(ENOMEM);
ast->id = -1; /* -1 to avoid clash with video stream ch_id */
ast->codec->channels = 1 + (v&1);
ast->codec->codec_type = AVMEDIA_TYPE_AUDIO;
@@ -218,7 +218,7 @@ static int swf_read_packet(AVFormatContext *s, AVPacket *pkt)
v = avio_r8(pb);
ast = avformat_new_stream(s, NULL);
if (!ast)
- return -1;
+ return AVERROR(ENOMEM);
ast->id = ch_id;
ast->codec->channels = 1 + (v&1);
ast->codec->codec_type = AVMEDIA_TYPE_AUDIO;
@@ -279,7 +279,7 @@ static int swf_read_packet(AVFormatContext *s, AVPacket *pkt)
if (i == s->nb_streams) {
vst = avformat_new_stream(s, NULL);
if (!vst)
- return -1;
+ return AVERROR(ENOMEM);
vst->id = -2; /* -2 to avoid clash with video stream and audio stream */
vst->codec->codec_type = AVMEDIA_TYPE_VIDEO;
vst->codec->codec_id = AV_CODEC_ID_MJPEG;