diff options
| author | Thomas Hellström <totte67@users.sourceforge.net> | 2005-05-03 19:25:10 +0000 |
|---|---|---|
| committer | Thomas Hellström <totte67@users.sourceforge.net> | 2005-05-03 19:25:10 +0000 |
| commit | 1daa2c4132617848de05b492beaf05d428f27ccc (patch) | |
| tree | 01a8e1133c64b2fdb3b326c1f7f94589632149bd /src/libmpeg2/decode.c | |
| parent | 746d3bb3ba53bc8c4b3931277934035b3c345b79 (diff) | |
| download | xine-lib-1daa2c4132617848de05b492beaf05d428f27ccc.tar.gz xine-lib-1daa2c4132617848de05b492beaf05d428f27ccc.tar.bz2 | |
**BUGFIX**
Fixed xvmc plugin segfault when it tried software blending on nonexistant xv image.
Cleaned up libmpeg2 behaviour on xxmc plugin abrupt software fallback.
CVS patchset: 7516
CVS date: 2005/05/03 19:25:10
Diffstat (limited to 'src/libmpeg2/decode.c')
| -rw-r--r-- | src/libmpeg2/decode.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/libmpeg2/decode.c b/src/libmpeg2/decode.c index 63e6edbb4..5d3f78ec5 100644 --- a/src/libmpeg2/decode.c +++ b/src/libmpeg2/decode.c @@ -508,7 +508,7 @@ static inline int parse_chunk (mpeg2dec_t * mpeg2dec, int code, mpeg2dec->frame_format, flags); libmpeg2_accel_new_frame( &mpeg2dec->accel, mpeg2dec->frame_format, - picture, ratio); + picture, ratio, flags); } else { ratio = get_aspect_ratio(mpeg2dec); picture->current_frame = @@ -520,7 +520,7 @@ static inline int parse_chunk (mpeg2dec_t * mpeg2dec, int code, flags); libmpeg2_accel_new_frame( &mpeg2dec->accel, mpeg2dec->frame_format, - picture, ratio); + picture, ratio, flags); if (picture->forward_reference_frame && picture->forward_reference_frame != picture->backward_reference_frame) @@ -664,6 +664,7 @@ void mpeg2_discontinuity (mpeg2dec_t * mpeg2dec) { if( !picture ) return; + mpeg2dec->in_slice = 0; mpeg2dec->pts = 0; if ( picture->current_frame ) picture->current_frame->pts = 0; |