diff options
Diffstat (limited to 'graphics/libxine/files/patch-src:liba52:xine_decoder.c')
| -rw-r--r-- | graphics/libxine/files/patch-src:liba52:xine_decoder.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/graphics/libxine/files/patch-src:liba52:xine_decoder.c b/graphics/libxine/files/patch-src:liba52:xine_decoder.c index 8e8fa240fe90..5a1826987a2f 100644 --- a/graphics/libxine/files/patch-src:liba52:xine_decoder.c +++ b/graphics/libxine/files/patch-src:liba52:xine_decoder.c @@ -1,5 +1,5 @@ ---- src/liba52/xine_decoder.c.orig Sat Jan 5 21:43:16 2002 -+++ src/liba52/xine_decoder.c Fri Apr 5 17:52:50 2002 +--- src/liba52/xine_decoder.c.orig Sun Apr 28 22:57:28 2002 ++++ src/liba52/xine_decoder.c Thu May 16 22:16:31 2002 @@ -36,8 +36,8 @@ #include <fcntl.h> @@ -11,7 +11,7 @@ #include "buffer.h" #include "xine_internal.h" #include "xineutils.h" -@@ -59,7 +59,7 @@ +@@ -58,7 +58,7 @@ int frame_length, frame_todo; uint16_t syncword; @@ -20,12 +20,12 @@ int a52_flags; int a52_bit_rate; int a52_sample_rate; -@@ -158,8 +158,11 @@ +@@ -154,8 +154,11 @@ + this->output_open = 0; this->pts = 0; - this->last_pts = 0; - if( !this->samples ) -- this->samples = a52_init (xine_mm_accel()); +- this->samples = a52_init (xine_mm_accel(), &this->samples_base); + this->a52_state = a52_init (xine_mm_accel()); + + if( (this->a52_state) != NULL ) @@ -34,7 +34,7 @@ /* * find out if this driver supports a52 output -@@ -288,7 +291,7 @@ +@@ -284,7 +287,7 @@ a52_output_flags = this->a52_flags_map[this->a52_flags & A52_CHANNEL_MASK]; @@ -43,7 +43,7 @@ this->frame_buffer, &a52_output_flags, &level, 384)) { -@@ -297,7 +300,7 @@ +@@ -293,7 +296,7 @@ } if (this->disable_dynrng) @@ -52,12 +52,12 @@ this->have_lfe = a52_output_flags & A52_LFE; if (this->have_lfe) -@@ -337,7 +340,7 @@ - int_samples = buf->mem; +@@ -334,7 +337,7 @@ + buf->num_frames = 256*6; for (i = 0; i < 6; i++) { - if (a52_block (&this->a52_state, this->samples)) { + if (a52_block (this->a52_state)) { printf ("liba52: a52_block error\n"); - return; - } + buf->num_frames = 0; + break; |