[FFmpeg-cvslog] lavf/swfdec: return more meaningful error codes.

Clément Bœsch git at videolan.org
Fri Oct 12 23:11:18 CEST 2012


ffmpeg | branch: master | Clément Bœsch <ubitux at gmail.com> | Thu Oct 11 23:59:54 2012 +0200| [cd78192d09d19e1bb3d85988e115f096378cad97] | committer: Clément Bœsch

lavf/swfdec: return more meaningful error codes.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cd78192d09d19e1bb3d85988e115f096378cad97
---

 libavformat/swfdec.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/libavformat/swfdec.c b/libavformat/swfdec.c
index 8ef24a5..e8ab718 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;



More information about the ffmpeg-cvslog mailing list