highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

check av_new_stream return value

Browse Source 
Originally committed as revision 11463 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Baptiste Coudurier
2008-01-08 13:55:15 +00:00
parent ebbe25d2a3
commit e55a4dd328
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/swf.c
View File

@ -671,6 +671,8 @@ static int swf_read_packet(AVFormatContext *s, AVPacket *pkt)
get_byte(pb); get_byte(pb);
/* Check for FLV1 */ /* Check for FLV1 */
vst = av_new_stream(s, ch_id); vst = av_new_stream(s, ch_id);
if (!vst)
return -1;
vst->codec->codec_type = CODEC_TYPE_VIDEO; vst->codec->codec_type = CODEC_TYPE_VIDEO;
vst->codec->codec_id = codec_get_id(swf_codec_tags, get_byte(pb)); vst->codec->codec_id = codec_get_id(swf_codec_tags, get_byte(pb));
av_set_pts_info(vst, 64, 256, swf->frame_rate); av_set_pts_info(vst, 64, 256, swf->frame_rate);
@ -683,6 +685,8 @@ static int swf_read_packet(AVFormatContext *s, AVPacket *pkt)
v = get_byte(pb); v = get_byte(pb);
swf->samples_per_frame = get_le16(pb); swf->samples_per_frame = get_le16(pb);
ast = av_new_stream(s, -1); /* -1 to avoid clash with video stream ch_id */ ast = av_new_stream(s, -1); /* -1 to avoid clash with video stream ch_id */
if (!ast)
return -1;
swf->audio_stream_index = ast->index; swf->audio_stream_index = ast->index;
ast->codec->channels = 1 + (v&1); ast->codec->channels = 1 + (v&1);
ast->codec->codec_type = CODEC_TYPE_AUDIO; ast->codec->codec_type = CODEC_TYPE_AUDIO;
@ -725,6 +729,8 @@ static int swf_read_packet(AVFormatContext *s, AVPacket *pkt)
} }
if (i == s->nb_streams) { if (i == s->nb_streams) {
vst = av_new_stream(s, -2); /* -2 to avoid clash with video stream and audio stream */ vst = av_new_stream(s, -2); /* -2 to avoid clash with video stream and audio stream */
if (!vst)
return -1;
vst->codec->codec_type = CODEC_TYPE_VIDEO; vst->codec->codec_type = CODEC_TYPE_VIDEO;
vst->codec->codec_id = CODEC_ID_MJPEG; vst->codec->codec_id = CODEC_ID_MJPEG;
av_set_pts_info(vst, 64, 256, swf->frame_rate); av_set_pts_info(vst, 64, 256, swf->frame_rate);