RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Reuse vp3_decode_flush instead of duplicating it. 

This also fixes that sometimes a frame would actually not be freed.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
This commit is contained in:
Reimar Döffinger 2011-10-22 13:33:44 +02:00
parent 1ac5b51203
commit 6f5b4ce612
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/vp3.c
View File

@ -1980,6 +1980,8 @@ error:
return -1; return -1;
} }
static void vp3_decode_flush(AVCodecContext *avctx);
/* /*
* This is the ffmpeg/libavcodec API module cleanup function. * This is the ffmpeg/libavcodec API module cleanup function.
*/ */
@ -2017,12 +2019,7 @@ static av_cold int vp3_decode_end(AVCodecContext *avctx)
free_vlc(&s->motion_vector_vlc); free_vlc(&s->motion_vector_vlc);
/* release all frames */ /* release all frames */
if (s->golden_frame.data[0]) vp3_decode_flush(avctx);
ff_thread_release_buffer(avctx, &s->golden_frame);
if (s->last_frame.data[0] && s->last_frame.type != FF_BUFFER_TYPE_COPY)
ff_thread_release_buffer(avctx, &s->last_frame);
/* no need to release the current_frame since it will always be pointing
* to the same frame as either the golden or last frame */
return 0; return 0;
} }