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, 0 insertions, 12 deletions

diff --git a/src/xine-utils/utils.c b/src/xine-utils/utils.c
index 59e5b8fb2..8b01bd52b 100644
--- a/src/xine-utils/utils.c
+++ b/src/xine-utils/utils.c
@@ -292,18 +292,6 @@ void *xine_xcalloc(size_t nmemb, size_t size) {
   return ptr;
 }
 
-void *xine_xmalloc_aligned(size_t alignment, size_t size, void **base) {
-
-  char *ptr;
-  
-  *base = ptr = calloc(1, size+alignment);
-  
-  while ((size_t) ptr % alignment)
-    ptr++;
-    
-  return ptr;
-}
-
 void *xine_memdup (const void *src, size_t length)
 {
   void *dst = malloc (length);