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

mpegvideo_enc: do not unreference frames before the code is done with them 

Fixes Ticket2592

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-05-25 20:29:17 +02:00
parent 5292dac34c
commit 5f44f47b72
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/mpegvideo.c
View File

@ -1714,7 +1714,6 @@ int ff_MPV_frame_start(MpegEncContext *s, AVCodecContext *avctx)
* frame has been coded/decoded. */ * frame has been coded/decoded. */
void ff_MPV_frame_end(MpegEncContext *s) void ff_MPV_frame_end(MpegEncContext *s)
{ {
int i;
/* redraw edges for the frame if decoding didn't complete */ /* redraw edges for the frame if decoding didn't complete */
// just to make sure that all data is rendered. // just to make sure that all data is rendered.
if (CONFIG_MPEG_XVMC_DECODER && s->avctx->xvmc_acceleration) { if (CONFIG_MPEG_XVMC_DECODER && s->avctx->xvmc_acceleration) {
@ -1763,13 +1762,6 @@ void ff_MPV_frame_end(MpegEncContext *s)
assert(i < MAX_PICTURE_COUNT); assert(i < MAX_PICTURE_COUNT);
#endif #endif
if (s->encoding) {
/* release non-reference frames */
for (i = 0; i < MAX_PICTURE_COUNT; i++) {
if (!s->picture[i].reference)
ff_mpeg_unref_picture(s, &s->picture[i]);
}
}
// clear copies, to avoid confusion // clear copies, to avoid confusion
#if 0 #if 0
memset(&s->last_picture, 0, sizeof(Picture)); memset(&s->last_picture, 0, sizeof(Picture));

7
libavcodec/mpegvideo_enc.c
View File

@ -1632,6 +1632,13 @@ vbv_retry:
} else { } else {
s->frame_bits = 0; s->frame_bits = 0;
} }
/* release non-reference frames */
for (i = 0; i < MAX_PICTURE_COUNT; i++) {
if (!s->picture[i].reference)
ff_mpeg_unref_picture(s, &s->picture[i]);
}
assert((s->frame_bits & 7) == 0); assert((s->frame_bits & 7) == 0);
pkt->size = s->frame_bits / 8; pkt->size = s->frame_bits / 8;