RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-29 02:22:19 +00:00
Code Issues Releases Wiki Activity

10l (null pointer dereference)

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17908 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
michael 2006-03-21 22:12:48 +00:00
parent 02b199e5e9
commit 565af71e4f
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libmpcodecs/ve_lavc.c
View File

@ -854,6 +854,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){
static int encode_frame(struct vf_instance_s* vf, AVFrame *pic, double pts){ static int encode_frame(struct vf_instance_s* vf, AVFrame *pic, double pts){
const char pict_type_char[5]= {'?', 'I', 'P', 'B', 'S'}; const char pict_type_char[5]= {'?', 'I', 'P', 'B', 'S'};
int out_size; int out_size;
double dts;
if(pic){ if(pic){
pic->opaque= malloc(sizeof(pts)); pic->opaque= malloc(sizeof(pts));
@ -862,15 +863,24 @@ static int encode_frame(struct vf_instance_s* vf, AVFrame *pic, double pts){
out_size = avcodec_encode_video(lavc_venc_context, mux_v->buffer, mux_v->buffer_size, out_size = avcodec_encode_video(lavc_venc_context, mux_v->buffer, mux_v->buffer_size,
pic); pic);
if(pts != MP_NOPTS_VALUE)
dts= pts - lavc_venc_context->delay * av_q2d(lavc_venc_context->time_base);
else
dts= MP_NOPTS_VALUE;
pts= lavc_venc_context->coded_frame->opaque ?
*(double*)lavc_venc_context->coded_frame->opaque
: MP_NOPTS_VALUE;
if(out_size == 0) { if(out_size == 0) {
++mux_v->encoder_delay; ++mux_v->encoder_delay;
return 0; return 0;
} }
muxer_write_chunk(mux_v,out_size,lavc_venc_context->coded_frame->key_frame?0x10:0, muxer_write_chunk(mux_v,out_size,lavc_venc_context->coded_frame->key_frame?0x10:0,
pts, dts, pts);
*(double*)lavc_venc_context->coded_frame->opaque);
free(lavc_venc_context->coded_frame->opaque); free(lavc_venc_context->coded_frame->opaque);
lavc_venc_context->coded_frame->opaque= NULL;
#if LIBAVCODEC_BUILD >= 4643 #if LIBAVCODEC_BUILD >= 4643
/* store psnr / pict size / type / qscale */ /* store psnr / pict size / type / qscale */