openharmony/third_party_ffmpeg
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_ffmpeg synced 2024-11-27 13:10:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

do not call (av_)abort()

Browse Source 
Originally committed as revision 3544 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2004-10-01 13:16:16 +00:00
parent 9fe5a7b831
commit 71c32f19b3
6 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/avienc.c
View File

@ -422,7 +422,7 @@ static int avi_write_header(AVFormatContext *s)
put_le32(pb, 0); put_le32(pb, 0);
break; break;
default: default:
av_abort(); return -1;
} }
end_tag(pb, strh); end_tag(pb, strh);
@ -438,7 +438,7 @@ static int avi_write_header(AVFormatContext *s)
} }
break; break;
default: default:
av_abort(); return -1;
} }
end_tag(pb, strf); end_tag(pb, strf);

9
libavformat/ffm.c
View File

@ -190,7 +190,7 @@ static int ffm_write_header(AVFormatContext *s)
put_le16(pb, codec->frame_size); put_le16(pb, codec->frame_size);
break; break;
default: default:
av_abort(); return -1;
} }
/* hack to have real time */ /* hack to have real time */
if (ffm_nopts) if (ffm_nopts)
@ -208,8 +208,7 @@ static int ffm_write_header(AVFormatContext *s)
/* init packet mux */ /* init packet mux */
ffm->packet_ptr = ffm->packet; ffm->packet_ptr = ffm->packet;
ffm->packet_end = ffm->packet + ffm->packet_size - FFM_HEADER_SIZE; ffm->packet_end = ffm->packet + ffm->packet_size - FFM_HEADER_SIZE;
if (ffm->packet_end < ffm->packet) assert(ffm->packet_end >= ffm->packet);
av_abort();
ffm->frame_offset = 0; ffm->frame_offset = 0;
ffm->pts = 0; ffm->pts = 0;
ffm->first_packet = 1; 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); get_buffer(pb, ffm->packet, ffm->packet_size - FFM_HEADER_SIZE);
ffm->packet_end = ffm->packet + (ffm->packet_size - FFM_HEADER_SIZE - fill_size); ffm->packet_end = ffm->packet + (ffm->packet_size - FFM_HEADER_SIZE - fill_size);
if (ffm->packet_end < ffm->packet) if (ffm->packet_end < ffm->packet)
av_abort(); return -1;
/* if first packet or resynchronization packet, we must /* if first packet or resynchronization packet, we must
handle it specifically */ handle it specifically */
if (ffm->first_packet || (frame_offset & 0x8000)) { if (ffm->first_packet || (frame_offset & 0x8000)) {
@ -355,7 +354,7 @@ static int ffm_read_data(AVFormatContext *s,
} }
ffm->first_packet = 0; ffm->first_packet = 0;
if ((frame_offset & 0x7ffff) < FFM_HEADER_SIZE) if ((frame_offset & 0x7ffff) < FFM_HEADER_SIZE)
av_abort(); return -1;
ffm->packet_ptr = ffm->packet + (frame_offset & 0x7fff) - FFM_HEADER_SIZE; ffm->packet_ptr = ffm->packet + (frame_offset & 0x7fff) - FFM_HEADER_SIZE;
if (!first) if (!first)
break; break;

2
libavformat/mpeg.c
View File

@ -314,7 +314,7 @@ static int mpeg_mux_init(AVFormatContext *ctx)
s->video_bound++; s->video_bound++;
break; break;
default: default:
av_abort(); return -1;
} }
} }
/* if no SCR, use first stream (audio) */ /* if no SCR, use first stream (audio) */

2
libavformat/raw.c
View File

@ -557,7 +557,7 @@ static int rawvideo_read_packet(AVFormatContext *s, AVPacket *pkt)
packet_size = avpicture_get_size(st->codec.pix_fmt, width, height); packet_size = avpicture_get_size(st->codec.pix_fmt, width, height);
if (packet_size < 0) if (packet_size < 0)
av_abort(); return -1;
if (av_new_packet(pkt, packet_size) < 0) if (av_new_packet(pkt, packet_size) < 0)
return AVERROR_IO; return AVERROR_IO;

2
libavformat/rm.c
View File

@ -315,7 +315,7 @@ static int rm_write_header(AVFormatContext *s)
stream->total_frames = stream->nb_packets; stream->total_frames = stream->nb_packets;
break; break;
default: default:
av_abort(); return -1;
} }
} }

2
libavformat/yuv4mpeg.c
View File

@ -214,7 +214,7 @@ static int yuv4_read_packet(AVFormatContext *s, AVPacket *pkt)
packet_size = avpicture_get_size(st->codec.pix_fmt, width, height); packet_size = avpicture_get_size(st->codec.pix_fmt, width, height);
if (packet_size < 0) if (packet_size < 0)
av_abort(); return -1;
if (av_new_packet(pkt, packet_size) < 0) if (av_new_packet(pkt, packet_size) < 0)
return AVERROR_IO; return AVERROR_IO;