bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Fix T47806: Blender animation player stop working correctly with XVID codec

Browse Source 
Something weird, seems some buffers _might_ be shared between codec context
and frame, which is quite weird. Could be a bug in FFmpeg or could be wrong
API usage somewhere else..
This commit is contained in:
Sergey Sharybin 2016-03-18 11:50:06 +05:00
parent 9777c5b0ca
commit cc12fc1f11
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source/blender/imbuf/intern/anim_movie.c
View File

@ -1168,6 +1168,15 @@ static void free_anim_ffmpeg(struct anim *anim)
if (anim->pCodecCtx) {
avcodec_close(anim->pCodecCtx);
avformat_close_input(&anim->pFormatCtx);
/* Special case here: pFrame could share pointers with codec,
* so in order to avoid double-free we don't use av_frame_free()
* to free the frame.
*
* Could it be a bug in FFmpeg?
*/
av_free(anim->pFrame);
if (!need_aligned_ffmpeg_buffer(anim)) {
/* If there's no need for own aligned buffer it means that FFmpeg's
* frame shares the same buffer as temporary ImBuf. In this case we
@ -1179,8 +1188,8 @@ static void free_anim_ffmpeg(struct anim *anim)
anim->x, anim->y);
}
av_frame_free(&anim->pFrameRGB);
av_frame_free(&anim->pFrame);
av_frame_free(&anim->pFrameDeinterlaced);
sws_freeContext(anim->img_convert_ctx);
IMB_freeImBuf(anim->last_frame);
if (anim->next_packet.stream_index != -1) {