diff --git a/source/blender/blenkernel/intern/writeffmpeg.c b/source/blender/blenkernel/intern/writeffmpeg.c index bbeb0e06156..b84aa1972f4 100644 --- a/source/blender/blenkernel/intern/writeffmpeg.c +++ b/source/blender/blenkernel/intern/writeffmpeg.c @@ -537,7 +537,7 @@ void start_ffmpeg_impl(RenderData *rd, int rectx, int recty) of->preload = (int)(0.5*AV_TIME_BASE); of->max_delay = (int)(0.7*AV_TIME_BASE); - + snprintf(of->filename, sizeof(of->filename), "%s", name); /* set the codec to the user's selection */ switch(ffmpeg_type) { diff --git a/source/blender/imbuf/intern/anim.c b/source/blender/imbuf/intern/anim.c index d595154ce99..ed0d291fef4 100644 --- a/source/blender/imbuf/intern/anim.c +++ b/source/blender/imbuf/intern/anim.c @@ -558,7 +558,6 @@ static int startffmpeg(struct anim * anim) { /* Find the decoder for the video stream */ pCodec=avcodec_find_decoder(pCodecCtx->codec_id); if(pCodec==NULL) { - avcodec_close(pCodecCtx); av_close_input_file(pFormatCtx); return -1; } @@ -575,7 +574,6 @@ static int startffmpeg(struct anim * anim) { pCodecCtx->error_concealment= 3; if(avcodec_open(pCodecCtx, pCodec)<0) { - avcodec_close(pCodecCtx); av_close_input_file(pFormatCtx); return -1; } diff --git a/source/blender/src/hddaudio.c b/source/blender/src/hddaudio.c index c7dd33ab977..76297b29983 100644 --- a/source/blender/src/hddaudio.c +++ b/source/blender/src/hddaudio.c @@ -140,13 +140,11 @@ struct hdaudio * sound_open_hdaudio(char * filename) /* Find the decoder for the audio stream */ pCodec = avcodec_find_decoder(pCodecCtx->codec_id); if(pCodec == NULL) { - avcodec_close(pCodecCtx); av_close_input_file(pFormatCtx); return 0; } if(avcodec_open(pCodecCtx, pCodec)<0) { - avcodec_close(pCodecCtx); av_close_input_file(pFormatCtx); return 0; }