virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

init AVFrame with defaults

Browse Source 
Originally committed as revision 2312 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2003-09-28 20:47:07 +00:00
parent d663a1fdc0
commit c6b1edc911
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ffplay.c
View File

@ -838,7 +838,7 @@ static int video_thread(void *arg)
AVPacket pkt1, *pkt = &pkt1; AVPacket pkt1, *pkt = &pkt1;
unsigned char *ptr; unsigned char *ptr;
int len, len1, got_picture; int len, len1, got_picture;
AVFrame frame; AVFrame *frame= avcodec_alloc_frame();
int64_t ipts; int64_t ipts;
double pts; double pts;
@ -853,15 +853,15 @@ static int video_thread(void *arg)
ipts = pkt->pts; ipts = pkt->pts;
ptr = pkt->data; ptr = pkt->data;
if (is->video_st->codec.codec_id == CODEC_ID_RAWVIDEO) { if (is->video_st->codec.codec_id == CODEC_ID_RAWVIDEO) {
avpicture_fill((AVPicture *)&frame, ptr, avpicture_fill((AVPicture *)frame, ptr,
is->video_st->codec.pix_fmt, is->video_st->codec.pix_fmt,
is->video_st->codec.width, is->video_st->codec.width,
is->video_st->codec.height); is->video_st->codec.height);
pts = 0; pts = 0;
if (ipts != AV_NOPTS_VALUE) if (ipts != AV_NOPTS_VALUE)
pts = (double)ipts * is->ic->pts_num / is->ic->pts_den; pts = (double)ipts * is->ic->pts_num / is->ic->pts_den;
frame.pict_type = FF_I_TYPE; frame->pict_type = FF_I_TYPE;
if (output_picture2(is, &frame, pts) < 0) if (output_picture2(is, frame, pts) < 0)
goto the_end; goto the_end;
} else { } else {
len = pkt->size; len = pkt->size;
@ -872,14 +872,14 @@ static int video_thread(void *arg)
ipts = AV_NOPTS_VALUE; ipts = AV_NOPTS_VALUE;
} }
len1 = avcodec_decode_video(&is->video_st->codec, len1 = avcodec_decode_video(&is->video_st->codec,
&frame, &got_picture, ptr, len); frame, &got_picture, ptr, len);
if (len1 < 0) if (len1 < 0)
break; break;
if (got_picture) { if (got_picture) {
pts = 0; pts = 0;
if (is->ipts != AV_NOPTS_VALUE) if (is->ipts != AV_NOPTS_VALUE)
pts = (double)is->ipts * is->ic->pts_num / is->ic->pts_den; pts = (double)is->ipts * is->ic->pts_num / is->ic->pts_den;
if (output_picture2(is, &frame, pts) < 0) if (output_picture2(is, frame, pts) < 0)
goto the_end; goto the_end;
is->picture_start = 1; is->picture_start = 1;
} }
@ -890,6 +890,7 @@ static int video_thread(void *arg)
av_free_packet(pkt); av_free_packet(pkt);
} }
the_end: the_end:
av_free(frame);
return 0; return 0;
} }