[SCM] libav/experimental: Do not completely bail out for invalid params, just skip the current sector.

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


The following commit has been merged in the experimental branch:
commit 435a6082f9e368196e0d8347858c63de1126af2c
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Thu Jun 26 23:00:00 2008 +0000

    Do not completely bail out for invalid params, just skip the current sector.
    
    Originally committed as revision 14002 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/psxstr.c b/libavformat/psxstr.c
index 7f5fe79..5be7a95 100644
--- a/libavformat/psxstr.c
+++ b/libavformat/psxstr.c
@@ -151,7 +151,7 @@ static int str_read_packet(AVFormatContext *s,
                      && current_sector < sector_count
                      && sector_count*VIDEO_DATA_CHUNK_SIZE >=frame_size)){
                     av_log(s, AV_LOG_ERROR, "Invalid parameters %d %d %d\n", current_sector, sector_count, frame_size);
-                    return AVERROR_INVALIDDATA;
+                    break;
                 }
 
                 if(str->channels[channel].video_stream_index < 0){

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list