diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-12-07 15:21:39 +0100 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-12-07 15:21:39 +0100 |
| commit | 545be54bdc7e0879cab0d5bb964816b88a354c72 (patch) | |
| tree | 5c7ca19c9ef302076d3525f6f7cc4480b8ba0619 /src/libffmpeg | |
| parent | e439a7fea30aab82fc5b704d9afdf3e63795464a (diff) | |
| download | xine-lib-545be54bdc7e0879cab0d5bb964816b88a354c72.tar.gz xine-lib-545be54bdc7e0879cab0d5bb964816b88a354c72.tar.bz2 | |
Don't try to free the frame if it's not allocated. Fixes bug FS#3.
Diffstat (limited to 'src/libffmpeg')
| -rw-r--r-- | src/libffmpeg/ff_video_decoder.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/libffmpeg/ff_video_decoder.c b/src/libffmpeg/ff_video_decoder.c index 8fc9cc8cb..1e32ad3a6 100644 --- a/src/libffmpeg/ff_video_decoder.c +++ b/src/libffmpeg/ff_video_decoder.c @@ -215,12 +215,14 @@ static void release_buffer(struct AVCodecContext *context, AVFrame *av_frame){ ff_video_decoder_t *this = (ff_video_decoder_t *)context->opaque; if (av_frame->type == FF_BUFFER_TYPE_USER) { - vo_frame_t *img = (vo_frame_t *)av_frame->opaque; + if ( av_frame->opaque ) { + vo_frame_t *img = (vo_frame_t *)av_frame->opaque; + + img->free(img); + } + xine_list_iterator_t it; - assert(av_frame->opaque); - img->free(img); - it = xine_list_find(this->dr1_frames, av_frame); assert(it); if( it != NULL ) |