[SCM] libav/experimental: All non zero returns of rm_assemble_video_frame() are errors, check things accordingly.

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:34:30 UTC 2013


The following commit has been merged in the experimental branch:
commit 51d6852f43774165beefee96a9e875db5e3a8189
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Tue Dec 30 19:49:27 2008 +0000

    All non zero returns of rm_assemble_video_frame() are errors, check things
    accordingly.
    
    Originally committed as revision 16398 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/rmdec.c b/libavformat/rmdec.c
index 2471f94..43fec70 100644
--- a/libavformat/rmdec.c
+++ b/libavformat/rmdec.c
@@ -590,7 +590,7 @@ ff_rm_parse_packet (AVFormatContext *s, ByteIOContext *pb,
 
     if (st->codec->codec_type == CODEC_TYPE_VIDEO) {
         rm->current_stream= st->id;
-        if(rm_assemble_video_frame(s, pb, rm, ast, pkt, len) == 1)
+        if(rm_assemble_video_frame(s, pb, rm, ast, pkt, len))
             return -1; //got partial frame
     } else if (st->codec->codec_type == CODEC_TYPE_AUDIO) {
         if ((st->codec->codec_id == CODEC_ID_RA_288) ||

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list