summaryrefslogtreecommitdiffstats
path: root/libmpcodecs
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-02-02 23:48:16 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-02-02 23:48:16 +0000
commit046cf63aff27747e4b62e4a260895023d60be68f (patch)
treeaf0494841d7841a12f567b426505a338488ba17b /libmpcodecs
parent75243478ce90d862f64c8fa6a03d0a651099317b (diff)
downloadmpv-046cf63aff27747e4b62e4a260895023d60be68f.tar.bz2
mpv-046cf63aff27747e4b62e4a260895023d60be68f.tar.xz
FFmpeg sync: LZO_OUTPUT_PADDING --> AV_LZO_OUTPUT_PADDING
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28449 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
-rw-r--r--libmpcodecs/native/nuppelvideo.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libmpcodecs/native/nuppelvideo.c b/libmpcodecs/native/nuppelvideo.c
index ff3e1f83fa..c0b3b8ac11 100644
--- a/libmpcodecs/native/nuppelvideo.c
+++ b/libmpcodecs/native/nuppelvideo.c
@@ -56,7 +56,7 @@ void decode_nuv( unsigned char *encoded, int encoded_size,
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, int encoded_size,
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");