Merge the avutil branch; port the "raw" video output plugin.

--HG--
rename : src/combined/ffmpeg/ff_dvaudio_decoder.c => src/audio_dec/ff_dvaudio_decoder.c
rename : src/combined/ffmpeg/ffmpeg_encoder.c => src/dxr3/ffmpeg_encoder.c

1 files changed, 6 insertions, 9 deletions

diff --git a/src/xine-engine/buffer.c b/src/xine-engine/buffer.c
index defa572db..563999bbf 100644
--- a/src/xine-engine/buffer.c
+++ b/src/xine-engine/buffer.c
@@ -36,6 +36,8 @@
 #include <stdlib.h>
 #include <assert.h>
 
+#include <mem.h>
+
 /********** logging **********/
 #define LOG_MODULE "buffer"
 #define LOG_VERBOSE
@@ -358,7 +360,7 @@ static void fifo_buffer_dispose (fifo_buffer_t *this) {
     received++;
   }
 
-  free (this->buffer_pool_base);
+  av_free (this->buffer_pool_base);
   pthread_mutex_destroy(&this->mutex);
   pthread_cond_destroy(&this->not_empty);
   pthread_mutex_destroy(&this->buffer_pool_mutex);
@@ -497,7 +499,6 @@ fifo_buffer_t *_x_fifo_buffer_new (int num_buffers, uint32_t buf_size) {
 
   fifo_buffer_t *this;
   int            i;
-  int            alignment = 2048;
   unsigned char *multi_buffer = NULL;
 
   this = calloc(1, sizeof(fifo_buffer_t));
@@ -527,15 +528,11 @@ fifo_buffer_t *_x_fifo_buffer_new (int num_buffers, uint32_t buf_size) {
    */
 
 
-  if (buf_size % alignment != 0)
-    buf_size += alignment - (buf_size % alignment);
-
   /*
-  printf ("Allocating %d buffers of %ld bytes in one chunk (alignment = %d)\n",
-	  num_buffers, (long int) buf_size, alignment);
+  printf ("Allocating %d buffers of %ld bytes in one chunk\n",
+	  num_buffers, (long int) buf_size);
 	  */
-  multi_buffer = xine_xmalloc_aligned (alignment, num_buffers * buf_size,
-				       &this->buffer_pool_base);
+  multi_buffer = this->buffer_pool_base = av_mallocz (num_buffers * buf_size);
 
   this->buffer_pool_top = NULL;