[MPlayer-cvslog] r28449 - trunk/libmpcodecs/native/nuppelvideo.c

diego subversion at mplayerhq.hu
Tue Feb 3 00:48:16 CET 2009


Author: diego
Date: Tue Feb  3 00:48:16 2009
New Revision: 28449

Log:
FFmpeg sync: LZO_OUTPUT_PADDING --> AV_LZO_OUTPUT_PADDING

Modified:
   trunk/libmpcodecs/native/nuppelvideo.c

Modified: trunk/libmpcodecs/native/nuppelvideo.c
==============================================================================
--- trunk/libmpcodecs/native/nuppelvideo.c	Mon Feb  2 21:22:36 2009	(r28448)
+++ trunk/libmpcodecs/native/nuppelvideo.c	Tue Feb  3 00:48:16 2009	(r28449)
@@ -56,7 +56,7 @@ void decode_nuv( unsigned char *encoded,
 		int in_len = encodedh->packetlength;
 #ifdef KEEP_BUFFER		
 		if (!previous_buffer) 
-			previous_buffer = ( unsigned char * ) malloc ( out_len + LZO_OUTPUT_PADDING );
+			previous_buffer = ( unsigned char * ) malloc ( out_len + AV_LZO_OUTPUT_PADDING );
 #endif
 
 		switch(encodedh->comptype)
@@ -69,7 +69,7 @@ void decode_nuv( unsigned char *encoded,
 			break;
 		    case '2': /* RTJpeg with LZO */
 			if (!buffer) 
-			    buffer = ( unsigned char * ) malloc ( out_len + LZO_OUTPUT_PADDING );
+			    buffer = ( unsigned char * ) malloc ( out_len + AV_LZO_OUTPUT_PADDING );
 			if (!buffer)
 			{
 			    mp_msg(MSGT_DECVIDEO, MSGL_ERR, "Nuppelvideo: error decompressing\n");



More information about the MPlayer-cvslog mailing list