diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/libmpeg2/decode.c | 42 |
1 files changed, 22 insertions, 20 deletions
diff --git a/src/libmpeg2/decode.c b/src/libmpeg2/decode.c index df5b824a5..39683a5eb 100644 --- a/src/libmpeg2/decode.c +++ b/src/libmpeg2/decode.c @@ -494,30 +494,32 @@ void mpeg2_reset (mpeg2dec_t * mpeg2dec) { mpeg2dec->pts = 0; - if( !picture->mpeg1 ) + if( !picture->mpeg1 ) mpeg2dec->is_sequence_needed = 1; + else { + /* to free reference frames one also needs to fix slice.c to + * abort when they are NULL. unfortunately it seems to break + * DVD menus. + * + * ...so let's do this for mpeg-1 only :) + */ + if ( picture->current_frame && + picture->current_frame != picture->backward_reference_frame && + picture->current_frame != picture->forward_reference_frame ) + picture->current_frame->free (picture->current_frame); + picture->current_frame = NULL; + + if (picture->forward_reference_frame) + picture->forward_reference_frame->free (picture->forward_reference_frame); + picture->forward_reference_frame = NULL; + + if (picture->backward_reference_frame) + picture->backward_reference_frame->free (picture->backward_reference_frame); + picture->backward_reference_frame = NULL; + } mpeg2dec->in_slice = 0; - /* to free reference frames one also needs to fix slice.c to - * abort when they are NULL. unfortunately it seems to break - * DVD menus. - */ - /* - if ( picture->current_frame && - picture->current_frame != picture->backward_reference_frame && - picture->current_frame != picture->forward_reference_frame ) - picture->current_frame->free (picture->current_frame); - picture->current_frame = NULL; - - if (picture->forward_reference_frame) - picture->forward_reference_frame->free (picture->forward_reference_frame); - picture->forward_reference_frame = NULL; - - if (picture->backward_reference_frame) - picture->backward_reference_frame->free (picture->backward_reference_frame); - picture->backward_reference_frame = NULL; - */ } /* flush must never allocate any frame (get_frame/duplicate_frame). |