# HG changeset patch # User diego # Date 1233618496 0 # Node ID 7cf701c9936799b71fe27f67eb83359b69a7239c # Parent 34794b885cb2b16c4fe3aaea299b61a9ea9fb1ca FFmpeg sync: LZO_OUTPUT_PADDING --> AV_LZO_OUTPUT_PADDING diff -r 34794b885cb2 -r 7cf701c99367 libmpcodecs/native/nuppelvideo.c --- a/libmpcodecs/native/nuppelvideo.c Mon Feb 02 20:22:36 2009 +0000 +++ b/libmpcodecs/native/nuppelvideo.c Mon Feb 02 23:48:16 2009 +0000 @@ -56,7 +56,7 @@ 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 @@ 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");