From: David Flynn <dav...@rd.bbc.co.uk> Flushing behaviour is enabled automatically internally and nolonger required for outputing pictures in coded_order.
includes: - testsuite: dont use deprecated api Signed-off-by: David Flynn <dav...@rd.bbc.co.uk> --- schroedinger/schrodecoder.c | 9 +++++++-- schroedinger/schrodecoder.h | 6 +++++- testsuite/decode_coded_order.c | 2 -- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/schroedinger/schrodecoder.c b/schroedinger/schrodecoder.c index dff923d..a8d45a6 100644 --- a/schroedinger/schrodecoder.c +++ b/schroedinger/schrodecoder.c @@ -697,11 +697,16 @@ schro_decoder_push_end_of_stream (SchroDecoder *decoder) return SCHRO_DECODER_EOS; } +/** + * schro_decoder_set_flushing: + * + * This function is depricated and has no effect. + * If control over the picture order is required, consult + * schro_decoder_set_picture_order() + */ int schro_decoder_set_flushing (SchroDecoder *decoder, int value) { - decoder->flushing = value; - return SCHRO_DECODER_OK; } diff --git a/schroedinger/schrodecoder.h b/schroedinger/schrodecoder.h index 4754690..603abc3 100644 --- a/schroedinger/schrodecoder.h +++ b/schroedinger/schrodecoder.h @@ -12,6 +12,10 @@ #include <schroedinger/schroasync.h> #include <schroedinger/schroarith.h> +#ifdef __GNUC__ +#define DEPRECATED __attribute__ ((deprecated)) +#endif + SCHRO_BEGIN_DECLS typedef struct _SchroDecoder SchroDecoder; @@ -141,7 +145,7 @@ SchroVideoFormat * schro_decoder_get_video_format (SchroDecoder *decoder); void schro_decoder_add_output_picture (SchroDecoder *decoder, SchroFrame *frame); int schro_decoder_push_ready (SchroDecoder *decoder); int schro_decoder_push (SchroDecoder *decoder, SchroBuffer *buffer); -int schro_decoder_set_flushing (SchroDecoder *decoder, int flushing); +int schro_decoder_set_flushing (SchroDecoder *decoder, int flushing) DEPRECATED; void schro_decoder_set_picture_order (SchroDecoder *decoder, int picture_order); int schro_decoder_push_end_of_stream (SchroDecoder *decoder); SchroFrame *schro_decoder_pull (SchroDecoder *decoder); diff --git a/testsuite/decode_coded_order.c b/testsuite/decode_coded_order.c index 53a27c3..d129c67 100644 --- a/testsuite/decode_coded_order.c +++ b/testsuite/decode_coded_order.c @@ -102,8 +102,6 @@ decode (FILE *file) } } - schro_decoder_set_flushing (decoder, TRUE); - go = 1; while (go) { it = schro_decoder_wait (decoder); -- 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