From: David Flynn <dav...@woaf.net>
Replaced with access to variable in local scope. decoder->picture
wasn't used across function calls and was always locally scoped.
Signed-off-by: David Flynn <dav...@rd.bbc.co.uk>
---
schroedinger/schrodecoder.c | 10 +++++-----
schroedinger/schrodecoder.h | 2 --
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/schroedinger/schrodecoder.c b/schroedinger/schrodecoder.c
index e3e7efd..8175efb 100644
--- a/schroedinger/schrodecoder.c
+++ b/schroedinger/schrodecoder.c
@@ -782,7 +782,6 @@ schro_decoder_iterate_picture (SchroDecoder *decoder,
SchroBuffer *buffer)
SchroParams *params;
picture = schro_picture_new (decoder);
- decoder->picture = picture;
params = &picture->params;
picture->input_buffer = buffer;
@@ -798,21 +797,22 @@ schro_decoder_iterate_picture (SchroDecoder *decoder,
SchroBuffer *buffer)
decoder->has_md5 = FALSE;
}
- schro_decoder_parse_picture_header(decoder->picture);
+ schro_decoder_parse_picture_header(picture);
+
+ SCHRO_DEBUG("picturenumber: %u", picture->picture_number);
if (!decoder->have_frame_number) {
if (params->num_refs > 0) {
SCHRO_ERROR("expected I frame after sequence header");
}
- decoder->next_frame_number = decoder->picture->picture_number;
+ decoder->next_frame_number = picture->picture_number;
decoder->have_frame_number = TRUE;
SCHRO_INFO("next frame number after seek %d", decoder->next_frame_number);
}
if (picture->is_ref) {
schro_async_lock (decoder->async);
- schro_decoder_reference_retire (decoder,
- decoder->picture->retired_picture_number);
+ schro_decoder_reference_retire (decoder, picture->retired_picture_number);
schro_decoder_reference_add (decoder, picture);
schro_async_unlock (decoder->async);
}
diff --git a/schroedinger/schrodecoder.h b/schroedinger/schrodecoder.h
index d138f65..318471f 100644
--- a/schroedinger/schrodecoder.h
+++ b/schroedinger/schrodecoder.h
@@ -44,8 +44,6 @@ struct _SchroDecoder {
SchroPictureNumber next_frame_number;
- SchroPicture *picture;
-
int major_version;
int minor_version;
int profile;
--
1.5.6.5
------------------------------------------------------------------------------
This SF.net email is sponsored by:
SourcForge Community
SourceForge wants to tell your story.
http://p.sf.net/sfu/sf-spreadtheword
_______________________________________________
Schrodinger-devel mailing list
Schrodinger-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/schrodinger-devel
