diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2004-10-01 13:16:16 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2004-10-01 13:16:16 +0000 |
| commit | 71c32f19b346f565c23d282f327e84a6af39edc7 (patch) | |
| tree | aeed385c079434edbc9e985ae60bf68538d468cd | |
| parent | 9fe5a7b83107051812a00eaebb01db11d7378980 (diff) | |
| download | ffmpeg-71c32f19b346f565c23d282f327e84a6af39edc7.tar.gz | |
do not call (av_)abort()
Originally committed as revision 3544 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavformat/avienc.c | 4 | ||||
| -rw-r--r-- | libavformat/ffm.c | 9 | ||||
| -rw-r--r-- | libavformat/mpeg.c | 2 | ||||
| -rw-r--r-- | libavformat/raw.c | 2 | ||||
| -rw-r--r-- | libavformat/rm.c | 2 | ||||
| -rw-r--r-- | libavformat/yuv4mpeg.c | 2 |
6 files changed, 10 insertions, 11 deletions
diff --git a/libavformat/avienc.c b/libavformat/avienc.c index 1ac9a408dc..4d2981780c 100644 --- a/libavformat/avienc.c +++ b/libavformat/avienc.c @@ -422,7 +422,7 @@ static int avi_write_header(AVFormatContext *s) put_le32(pb, 0); break; default: - av_abort(); + return -1; } end_tag(pb, strh); @@ -438,7 +438,7 @@ static int avi_write_header(AVFormatContext *s) } break; default: - av_abort(); + return -1; } end_tag(pb, strf); diff --git a/libavformat/ffm.c b/libavformat/ffm.c index 22a2a812ff..89764c3497 100644 --- a/libavformat/ffm.c +++ b/libavformat/ffm.c @@ -190,7 +190,7 @@ static int ffm_write_header(AVFormatContext *s) put_le16(pb, codec->frame_size); break; default: - av_abort(); + return -1; } /* hack to have real time */ if (ffm_nopts) @@ -208,8 +208,7 @@ static int ffm_write_header(AVFormatContext *s) /* init packet mux */ ffm->packet_ptr = ffm->packet; ffm->packet_end = ffm->packet + ffm->packet_size - FFM_HEADER_SIZE; - if (ffm->packet_end < ffm->packet) - av_abort(); + assert(ffm->packet_end >= ffm->packet); ffm->frame_offset = 0; ffm->pts = 0; ffm->first_packet = 1; @@ -340,7 +339,7 @@ static int ffm_read_data(AVFormatContext *s, get_buffer(pb, ffm->packet, ffm->packet_size - FFM_HEADER_SIZE); ffm->packet_end = ffm->packet + (ffm->packet_size - FFM_HEADER_SIZE - fill_size); if (ffm->packet_end < ffm->packet) - av_abort(); + return -1; /* if first packet or resynchronization packet, we must handle it specifically */ if (ffm->first_packet || (frame_offset & 0x8000)) { @@ -355,7 +354,7 @@ static int ffm_read_data(AVFormatContext *s, } ffm->first_packet = 0; if ((frame_offset & 0x7ffff) < FFM_HEADER_SIZE) - av_abort(); + return -1; ffm->packet_ptr = ffm->packet + (frame_offset & 0x7fff) - FFM_HEADER_SIZE; if (!first) break; diff --git a/libavformat/mpeg.c b/libavformat/mpeg.c index adf871a669..cf6cb0b375 100644 --- a/libavformat/mpeg.c +++ b/libavformat/mpeg.c @@ -314,7 +314,7 @@ static int mpeg_mux_init(AVFormatContext *ctx) s->video_bound++; break; default: - av_abort(); + return -1; } } /* if no SCR, use first stream (audio) */ diff --git a/libavformat/raw.c b/libavformat/raw.c index 9c1bd929c9..dadc495766 100644 --- a/libavformat/raw.c +++ b/libavformat/raw.c @@ -557,7 +557,7 @@ static int rawvideo_read_packet(AVFormatContext *s, AVPacket *pkt) packet_size = avpicture_get_size(st->codec.pix_fmt, width, height); if (packet_size < 0) - av_abort(); + return -1; if (av_new_packet(pkt, packet_size) < 0) return AVERROR_IO; diff --git a/libavformat/rm.c b/libavformat/rm.c index de16a3033c..59888e2cdf 100644 --- a/libavformat/rm.c +++ b/libavformat/rm.c @@ -315,7 +315,7 @@ static int rm_write_header(AVFormatContext *s) stream->total_frames = stream->nb_packets; break; default: - av_abort(); + return -1; } } diff --git a/libavformat/yuv4mpeg.c b/libavformat/yuv4mpeg.c index 182536c4f7..6ebe185b64 100644 --- a/libavformat/yuv4mpeg.c +++ b/libavformat/yuv4mpeg.c @@ -214,7 +214,7 @@ static int yuv4_read_packet(AVFormatContext *s, AVPacket *pkt) packet_size = avpicture_get_size(st->codec.pix_fmt, width, height); if (packet_size < 0) - av_abort(); + return -1; if (av_new_packet(pkt, packet_size) < 0) return AVERROR_IO; |